[gnome-shell] data: Actually substitute @GETTEXT_PACKAGE@ in schema files



commit b79d17332ee2622e562045dcacd985b9dfdf155a
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Tue Jun 5 10:58:25 2012 -0400

    data: Actually substitute @GETTEXT_PACKAGE@ in schema files
    
    https://bugzilla.gnome.org/show_bug.cgi?id=677497

 data/Makefile.am                                   |   12 +++++++++---
 ...ma.xml.in => org.gnome.shell.gschema.xml.in.in} |    0
 2 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 4803081..67d858e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -56,6 +56,11 @@ dist_theme_DATA =				\
 gsettings_SCHEMAS = org.gnome.shell.gschema.xml
 
 @INTLTOOL_XML_NOMERGE_RULE@
+
+%.gschema.xml.in: %.gschema.xml.in.in Makefile
+	$(AM_V_GEN) sed -e 's|@GETTEXT_PACKAGE[ ]|$(GETTEXT_PACKAGE)|g' \
+	$< > $@ || rm $@
+
 @GSETTINGS_RULES@
 
 # We need to compile schemas at make time
@@ -80,12 +85,13 @@ EXTRA_DIST =						\
 	$(menu_DATA)					\
 	$(shaders_DATA)					\
 	$(convert_DATA)					\
-	org.gnome.shell.gschema.xml.in
+	org.gnome.shell.gschema.xml.in.in
 
 CLEANFILES =						\
 	gnome-shell.desktop.in				\
 	gnome-shell-extension-prefs.in			\
 	$(desktop_DATA)					\
 	$(gsettings_SCHEMAS)				\
-	gschemas.compiled
-
+	gschemas.compiled				\
+	org.gnome.shell.gschema.valid			\
+	org.gnome.shell.gschema.xml.in
diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in.in
similarity index 100%
rename from data/org.gnome.shell.gschema.xml.in
rename to data/org.gnome.shell.gschema.xml.in.in



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]