[epiphany] build: intltool 0.50 add proper support for gsettings schemas

[Javier JardÃn <jjardon src gnome org>]

commit 65391202450a610ed2f25b433ee8ba73e2cf440f
Author: Javier JardÃn <jjardon gnome org>
Date:   Tue Mar 27 16:10:43 2012 +0100

    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

 configure.ac                                       |    2 +-
 data/Makefile.am                                   |    9 +++------
 ...chema.xml.in => org.gnome.epiphany.gschema.xml} |    0
 3 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7048395..7ef3938 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,7 @@ AC_HEADER_STDC
 AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
 AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
 
-IT_PROG_INTLTOOL([0.40.0])
+IT_PROG_INTLTOOL([0.50.0])
 
 GLIB_GSETTINGS
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 2672fc3..3ac9bee 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
similarity index 100%
rename from data/org.gnome.epiphany.gschema.xml.in
rename to data/org.gnome.epiphany.gschema.xml