diff options
| author | Stefano Karapetsas <[email protected]> | 2012-11-03 03:52:31 -0700 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-11-03 03:52:31 -0700 |
| commit | 2256a902e87b28697407c304bcb96ab1aeb3f669 (patch) | |
| tree | 723fbf30b7e26a55d01463c0f703bab2c8ee0b88 /data/Makefile.am | |
| parent | ce7da346624297407644a1be28f75de0856e1f49 (diff) | |
| parent | 8d80642d5cd6ce3522029525505abc991087f258 (diff) | |
| download | mate-screensaver-2256a902e87b28697407c304bcb96ab1aeb3f669.tar.bz2 mate-screensaver-2256a902e87b28697407c304bcb96ab1aeb3f669.tar.xz | |
Merge pull request #8 from NiceandGently/master
gsettings migration
Diffstat (limited to 'data/Makefile.am')
| -rw-r--r-- | data/Makefile.am | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 1bae8e9..37e91de 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -9,12 +9,6 @@ man_MANS = \ mate-screensaver-preferences.1 \ $(NULL) -@INTLTOOL_SCHEMAS_RULE@ - -schemasdir = @MATECONF_SCHEMA_FILE_DIR@ -schemas_in_files = mate-screensaver.schemas.in -schemas_DATA = $(schemas_in_files:.schemas.in=.schemas) - @INTLTOOL_DESKTOP_RULE@ desktopdir = $(datadir)/applications @@ -46,8 +40,17 @@ pkgconfig_DATA = mate-screensaver.pc dbussessionservicedir = $(DBUS_SESSION_SERVICE_DIR) dbussessionservice_DATA = org.mate.ScreenSaver.service +@GSETTINGS_RULES@ +@INTLTOOL_XML_NOMERGE_RULE@ + +gsettings_SCHEMAS = org.mate.screensaver.gschema.xml + +migrationdir = $(datadir)/MateConf/gsettings +dist_migration_DATA = org.mate.screensaver.gschema.migrate + + EXTRA_DIST = \ - $(schemas_in_files) \ + $(gsettings_SCHEMAS:.xml=.xml.in.in) \ $(desktop_in_files) \ $(directory_in_files) \ $(gtkbuilder_DATA) \ @@ -60,26 +63,15 @@ EXTRA_DIST = \ $(NULL) DISTCLEANFILES = \ - $(schemas_DATA) \ + $(gsettings_SCHEMAS) $(desktop_DATA) \ $(directory_DATA) \ $(NULL) MAINTAINERCLEANFILES = \ *~ \ - Makefile.in - -if MATECONF_SCHEMAS_INSTALL -# don't do this if we are building in eg. rpm -install-data-local: $(schemas_DATA) - if test -z "$(DESTDIR)" ; then \ - for p in $(schemas_DATA) ; do \ - MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p ; \ - done \ - fi -else -install-data-local: -endif + Makefile.in \ + $(gsettings_SCHEMAS:.xml=.valid) install-data-hook: @system=`uname`; \ |