From: Bruno Haible <bruno@clisp.org>
Date: Mon, 7 Jan 2002 17:41:34 +0000 (+0000)
Subject: Make po/Makefile work when builddir != srcdir.
X-Git-Tag: v0.11~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a52a28f262e9efeb37da1907c7811b95afeaa860;p=thirdparty%2Fgettext.git

Make po/Makefile work when builddir != srcdir.
---

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 317a05697..7b4c9d3e8 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-05  Bruno Haible  <bruno@clisp.org>
+
+	* gettext.m4 (AM_PO_SUBDIRS): Look for Rules-* files in the source dir,
+	not in the build dir.
+
 2002-01-04  Bruno Haible  <bruno@clisp.org>
 
 	* gettext.m4 (AM_GNU_GETTEXT): If no intl directory exists and GNU
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index e59f46660..8ffba956c 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -379,7 +379,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
           fi
           test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
           sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-          for f in "$ac_dir"/Rules-*; do
+          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
             if test -f "$f"; then
               case "$f" in
                 *.orig | *.bak | *~) ;;
diff --git a/po/ChangeLog b/po/ChangeLog
index 68eb62ee1..0f94c2e29 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-05  Bruno Haible  <bruno@clisp.org>
+
+	* Rules-quot (.insert-header.po-update-en): Set GETTEXTLIBDIR to an
+	absolute path, not a relative path.
+
 2002-01-05  Bruno Haible  <bruno@clisp.org>
 
 	* Makefile.in.in ($(DOMAIN).pot-update): Renamed from target
diff --git a/po/Rules-quot b/po/Rules-quot
index 132e94fcb..5f46d237d 100644
--- a/po/Rules-quot
+++ b/po/Rules-quot
@@ -9,7 +9,7 @@ en@boldquot.po-update: en@boldquot.po-update-en
 
 .insert-header.po-update-en:
 	@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
-	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=$(top_srcdir)/src; export GETTEXTLIBDIR; fi; \
+	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
 	tmpdir=`pwd`; \
 	echo "$$lang:"; \
 	ll=`echo $$lang | sed -e 's/@.*//'`; \