diff options
| author | Javier Jardón <jjardon@gnome.org> | 2012-03-27 23:10:43 +0800 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2012-03-29 02:15:27 +0800 |
| commit | 65391202450a610ed2f25b433ee8ba73e2cf440f (patch) | |
| tree | a2f65337f71ed0bb518738c1159cb64ca48e7077 /data | |
| parent | 233c86a85e63f00a246badabf1879569ad5d6ea6 (diff) | |
| download | gsoc2013-epiphany-65391202450a610ed2f25b433ee8ba73e2cf440f.tar.gz gsoc2013-epiphany-65391202450a610ed2f25b433ee8ba73e2cf440f.tar.zst gsoc2013-epiphany-65391202450a610ed2f25b433ee8ba73e2cf440f.zip | |
build: intltool 0.50 add proper support for gsettings schemas
Its not needed to use the .in hack anymore
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=672932
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 9 | ||||
| -rw-r--r-- | data/org.gnome.epiphany.gschema.xml (renamed from data/org.gnome.epiphany.gschema.xml.in) | 0 |
2 files changed, 3 insertions, 6 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 2672fc333..3ac9beef8 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -13,9 +13,7 @@ convert_DATA = epiphany.convert gsettings_ENUM_NAMESPACE = org.gnome.Epiphany gsettings_ENUM_FILES = $(top_srcdir)/lib/ephy-prefs.h -gsettings_files = org.gnome.epiphany.gschema.xml.in -gsettings_SCHEMAS = $(gsettings_files:.xml.in=.xml) -@INTLTOOL_XML_NOMERGE_RULE@ +gsettings_SCHEMAS = org.gnome.epiphany.gschema.xml @GSETTINGS_RULES@ aboutdir = $(pkgdatadir) @@ -69,7 +67,7 @@ EXTRA_DIST = \ $(service_DATA) \ $(m4data_DATA) \ $(default_bookmarks_in_files) \ - $(gsettings_files) \ + $(gsettings_SCHEMAS) \ $(convert_DATA) \ epiphany-service.xml \ check-mime.py @@ -78,5 +76,4 @@ DISTCLEANFILES = \ $(service_DATA) \ $(pkgconfig_DATA) \ $(desktop_DATA) \ - $(default_bookmarks_DATA) \ - $(gsettings_SCHEMAS) + $(default_bookmarks_DATA) diff --git a/data/org.gnome.epiphany.gschema.xml.in b/data/org.gnome.epiphany.gschema.xml index b06f4232b..b06f4232b 100644 --- a/data/org.gnome.epiphany.gschema.xml.in +++ b/data/org.gnome.epiphany.gschema.xml |