diff options
author | Shaun McCance <shaunm@gnome.org> | 2010-05-27 11:44:43 -0500 |
---|---|---|
committer | Shaun McCance <shaunm@gnome.org> | 2010-05-27 11:44:43 -0500 |
commit | 48ac879bbc582fc0290873fc19242b8cfa1553cf (patch) | |
tree | 49625c741ba99a5cd25136f2d9f11e71fa110b37 | |
parent | ac45b7786b8d6a5b50706ddfddd334fdf960efb6 (diff) | |
download | yelp-48ac879bbc582fc0290873fc19242b8cfa1553cf.tar.gz |
[data/Makefile.am] Update for gsettings.m4 changes, build fixes
-rw-r--r-- | data/Makefile.am | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 6099e505..50334c4e 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -6,12 +6,8 @@ MOSTLYCLEANFILES = @INTLTOOL_XML_RULE@ @INTLTOOL_SCHEMAS_RULE@ -gsettingsschema_DATA = org.gnome.yelp.gschema.xml -# GSETTINGS_CHECK_RULE broken for non-srcdir, blocks distcheck -if GSETTINGS_SCHEMAS_INSTALL -install-data-hook: - $(GLIB_COMPILE_SCHEMAS) $(DESTDIR)$(gsettingsschemadir) -endif +gsettings_SCHEMAS = org.gnome.yelp.gschema.xml +@GSETTINGS_RULES@ tocdir = $(datadir)/yelp toc_DATA = man.xml toc.xml scrollkeeper.xml info.xml @@ -30,7 +26,6 @@ EXTRA_DIST = \ toc.xml toc.xml.in \ info.xml info.xml.in \ scrollkeeper.xml default.css \ - $(gsettingsschema_DATA) \ - $(js_DATA) + $(gsettings_SCHEMAS) $(js_DATA) CLEANFILES = toc.xml man.xml info.xml |