From: Bruno Haible <bruno@clisp.org>
Date: Tue, 4 Dec 2001 19:26:11 +0000 (+0000)
Subject: Make builds with builddir != srcdir work again.
X-Git-Tag: v0.11~229
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85d2107e76dd6464d5fc0983d1009a7d101dce8b;p=thirdparty%2Fgettext.git

Make builds with builddir != srcdir work again.
---

diff --git a/m4/ChangeLog b/m4/ChangeLog
index a46421024..cde99555f 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-03  Bruno Haible  <bruno@clisp.org>
+
+	* gettext.m4 (AM_PO_SUBDIRS): Fix construction of Makefile if
+	builddir != srcdir.
+
 2001-12-02  Bruno Haible  <bruno@clisp.org>
 
 	* lib-ld.m4: New file, extracted from libtool-1.4 libtool.m4.
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index 2bb87ac4d..b700efa01 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -370,7 +370,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
             done
           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_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"
+          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
             if test -f "$f"; then
               cat "$f" >> "$ac_dir/Makefile"