gnumeric r16866 - in trunk: . po-functions

[mortenw svn gnome org]

Author: mortenw
Date: Thu Oct  9 01:18:14 2008
New Revision: 16866
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16866&view=rev

Log:
2008-10-08  Morten Welinder  <terra gnome org>

	* configure.in: Call IT_PO_SUBDIR for po-functions.
	* autogen.sh: Don't try to distribute po-functions/LINGUAS



Modified:
   trunk/ChangeLog
   trunk/autogen.sh
   trunk/configure.in
   trunk/po-functions/Makefile.in.in

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Thu Oct  9 01:18:14 2008
@@ -64,6 +64,7 @@
 s|$(srcdir)/LINGUAS|$(top_srcdir)/po/LINGUAS|g
 /^GETTEXT_PACKAGE =/a\
 XGETTEXT_KEYWORDS = --keyword --keyword=F_
+/^EXTRA_DISTFILES/s/ LINGUAS//
 ' $srcdir/po/Makefile.in.in >$srcdir/po-functions/Makefile.in.in
 
 printbold "Creating po-functions/POTFILES.{in,skip}."

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Oct  9 01:18:14 2008
@@ -56,8 +56,9 @@
 # Make --disable-static the default
 AC_DISABLE_STATIC
 
-dnl We use the XGETTEXT_KEYWORDS variable, thus we need intltool >= 0.29:
+dnl We use a LINGUAS file, so we need intltool >= 0.35:
 IT_PROG_INTLTOOL([0.35.0])
+IT_PO_SUBDIR(po-functions)
 
 if test `expr gnumeric_version_major % 2` -eq 1; then
     AC_MSG_NOTICE([NOTE: This is a development release])
@@ -666,9 +667,9 @@
         sed -e '$!s/$/ \\/' >po-functions/POTFILES
 ]
 dnl Finally, register for creation of po-functions/Makefile:
+dnl We do not currently do anything here.
 AC_CONFIG_COMMANDS(po-functions/Makefile,
-  [sed -e "/POTFILES =/r po-functions/POTFILES" \
-	po-functions/Makefile.in > po-functions/Makefile])
+  [cp po-functions/Makefile.in po-functions/Makefile])
 
 SAVE_LIBS="$LIBS"
 LIBS="$LIBS $GNUMERIC_LIBS"

Modified: trunk/po-functions/Makefile.in.in
==============================================================================
--- trunk/po-functions/Makefile.in.in	(original)
+++ trunk/po-functions/Makefile.in.in	Thu Oct  9 01:18:14 2008
@@ -64,7 +64,7 @@
 POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
 
 DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
-EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
+EXTRA_DISTFILES = POTFILES.skip Makevars
 
 POTFILES = \
 # This comment gets stripped out