gucharmap r1807 - trunk

[chpe svn gnome org]

Author: chpe
Date: Sun Jun 15 21:34:55 2008
New Revision: 1807
URL: http://svn.gnome.org/viewvc/gucharmap?rev=1807&view=rev

Log:
Fix distcheck with intltool svn.


Modified:
   trunk/Makefile.am
   trunk/configure.ac

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sun Jun 15 21:34:55 2008
@@ -15,27 +15,22 @@
 desktopdir = $(datadir)/applications
 desktop_in_files = gucharmap.desktop.in.in
 desktop_DATA 	 = $(desktop_in_files:.desktop.in.in=.desktop)
- INTLTOOL_DESKTOP_RULE@
 
 schemadir         = $(GCONF_SCHEMA_FILE_DIR)
 schema_in_files   = gucharmap.schemas.in
 schema_DATA       = $(schema_in_files:.schemas.in=.schemas)
- INTLTOOL_SCHEMAS_RULE@
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = gucharmap-2.pc
 
 EXTRA_DIST = \
 	autogen.sh \
 	gtkrc.win32 \
-	intltool-extract.in \
-	intltool-merge.in \
-	intltool-update.in \
 	gnome-doc-utils.make \
 	$(schema_in_files) \
 	COPYING.UNICODE \
 	$(NULL)
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gucharmap-2.pc
-
 DISTCHECK_CONFIGURE_FLAGS = \
 	--disable-scrollkeeper \
 	--disable-schemas-install \
@@ -43,14 +38,16 @@
 
 DISTCLEANFILES = \
         gnome-doc-utils.make \
-	intltool-update \
-	intltool-extract \
-	intltool-merge \
 	$(schema_DATA)
 
+install-data-local: $(schema_DATA)
 if GCONF_SCHEMAS_INSTALL
-install-data-local:
 	if test -z "$(DESTDIR)" ; then \
-		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/$(schema_DATA); \
+		for p in $^ ; do \
+			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p 2>&1 > /dev/null; \
+		done \
 	fi
 endif
+
+ INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_SCHEMAS_RULE@

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Jun 15 21:34:55 2008
@@ -49,7 +49,7 @@
 AC_PROG_CC
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.39.99])
 
 AM_PROG_CC_C_O