diff options
| author | Steve Zesch <[email protected]> | 2012-11-18 20:50:09 -0500 |
|---|---|---|
| committer | Steve Zesch <[email protected]> | 2012-11-18 20:50:09 -0500 |
| commit | 6552b09151c83c57041d72fc79a22f327ef5cb9f (patch) | |
| tree | ef347a5a4f0e6f1071c33cce1fd3b17da631a6fb /baobab/data/Makefile.am | |
| parent | e4d70e0aae8b9d03038247e48136209577eee5a6 (diff) | |
| parent | a344bc1e3cc9c03e1c1837c468a237bd15468b2a (diff) | |
| download | mate-utils-6552b09151c83c57041d72fc79a22f327ef5cb9f.tar.bz2 mate-utils-6552b09151c83c57041d72fc79a22f327ef5cb9f.tar.xz | |
Merge branch 'master' of github.com:mate-desktop/mate-utils
Diffstat (limited to 'baobab/data/Makefile.am')
| -rw-r--r-- | baobab/data/Makefile.am | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/baobab/data/Makefile.am b/baobab/data/Makefile.am index 66bbd2b9..3ae71bd6 100644 --- a/baobab/data/Makefile.am +++ b/baobab/data/Makefile.am @@ -11,29 +11,23 @@ $(baobabapp_in_files): $(baobabapp_in_files:.desktop.in=.desktop.in.in) @INTLTOOL_DESKTOP_RULE@ -schemasdir = $(MATECONF_SCHEMA_FILE_DIR) -schemas_in_files = baobab.schemas.in -schemas_DATA = $(schemas_in_files:.schemas.in=.schemas) -@INTLTOOL_SCHEMAS_RULE@ +gsettingsschema_in_files = org.mate.disk-usage-analyzer.gschema.xml.in +gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml) +.PRECIOUS: $(gsettings_SCHEMAS) -man_MANS = mate-disk-usage-analyzer.1 +@INTLTOOL_XML_NOMERGE_RULE@ + +@GSETTINGS_RULES@ -if MATECONF_SCHEMAS_INSTALL -install-data-local: - if test -z "$(DESTDIR)" ; then \ - MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-install-rule $(schemas_DATA) ; \ - fi -else -install-data-local: -endif +man_MANS = mate-disk-usage-analyzer.1 EXTRA_DIST = \ $(ui_DATA) \ - mate-disk-usage-analyzer.desktop.desktop.in.in \ - $(schemas_in_files) \ + mate-disk-usage-analyzer.desktop.in.in \ + $(gsettingsschema_in_files) \ $(man_MANS) CLEANFILES = \ $(baobabapp_in_files) \ $(baobabapp_DATA) \ - $(schemas_DATA) + $(gsettings_SCHEMAS) |