diff options
| author | Stefano Karapetsas <[email protected]> | 2012-10-03 07:33:50 -0700 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-10-03 07:33:50 -0700 |
| commit | 8af5555721e4791d09db088a41c784bf2c4fd7f5 (patch) | |
| tree | fb36698c7c1aef79bcc1fd33cf56596d4cdd4dd9 /data/Makefile.am | |
| parent | 8b06eb18651798d1f02bd358fa43119d914a744f (diff) | |
| parent | c0ea7fefe55f518145afd68f201bb6ed07d6e866 (diff) | |
| download | mate-user-share-8af5555721e4791d09db088a41c784bf2c4fd7f5.tar.bz2 mate-user-share-8af5555721e4791d09db088a41c784bf2c4fd7f5.tar.xz | |
Merge pull request #2 from NiceandGently/master
convert mateconf to gsettings
Diffstat (limited to 'data/Makefile.am')
| -rw-r--r-- | data/Makefile.am | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 1f29328..93ce715 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,10 +1,5 @@ SUBDIRS = icons -@INTLTOOL_SCHEMAS_RULE@ -schemadir = $(MATECONF_SCHEMA_FILE_DIR) -schema_in_files = desktop_mate_file_sharing.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) - @INTLTOOL_DESKTOP_RULE@ desktopdir = $(datadir)/applications desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @@ -17,19 +12,10 @@ autostart_in_files = mate-user-share.desktop.in appdir = $(datadir)/mate-user-share app_DATA=dav_user_2.0.conf dav_user_2.2.conf dav_groupfile file-share-properties.ui -install-data-local: -if MATECONF_SCHEMAS_INSTALL - -MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) \ - $(MATECONFTOOL) --makefile-install-rule $(schema_DATA) -endif +gsettings_SCHEMAS = org.mate.FileSharing.gschema.xml +@GSETTINGS_RULES@ -if MATECONF_SCHEMAS_INSTALL -uninstall-local: - -MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) \ - $(MATECONFTOOL) --makefile-uninstall-rule $(schema_DATA) -endif - -EXTRA_DIST = $(schema_in_files) \ +EXTRA_DIST = $(gsettings_SCHEMAS) \ $(app_DATA) \ $(desktop_in_files) \ mate-user-share.desktop.in.in \ @@ -37,6 +23,4 @@ EXTRA_DIST = $(schema_in_files) \ CLEANFILES = $(desktop_DATA) $(autostart_DATA) -DISTCLEANFILES = $(schema_DATA) - -include $(top_srcdir)/git.mk |