Make VPATH builds with $srcdir = $builddir work.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index f978ba1dcfe7775527f28fc1b9ae01c3ef1bd98e..921ff281a70388d414c8190f96d686d293fa3d7b 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-03  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.in: Add comments about VPATH.
+
 2005-07-31  Bruno Haible  <bruno@clisp.org>
 
        * lock.h (gl_lock_initializer): New macro.

diff --git a/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in
index 54d055abda500fede7939c4e0527cb902c5a9c6b..20ebd611de5ae10a92fd36d9251aea4efe51e494 100644 (file)
--- a/gettext-runtime/intl/Makefile.in
+++ b/gettext-runtime/intl/Makefile.in
@@ -24,6 +24,17 @@ SHELL = /bin/sh
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = ..
+
+# The VPATH variables allows builds with $builddir != $srcdir, assuming a
+# 'make' program that supports VPATH (such as GNU make). This line is removed
+# by autoconf automatically when "$(srcdir)" = ".".
+# In this directory, the VPATH handling is particular:
+# 1. If INTL_LIBTOOL_SUFFIX_PREFIX is 'l' (indicating a build with libtool),
+#    the .c -> .lo rules carefully use $(srcdir), so that VPATH can be omitted.
+# 2. If PACKAGE = gettext-tools, VPATH _must_ be omitted, because otherwise
+#    'make' does the wrong thing if GNU gettext was configured with
+#    "./configure --srcdir=`pwd`", namely it gets confused by the .lo and .la
+#    files it finds in srcdir = ../../gettext-runtime/intl.
 VPATH = $(srcdir)
 
 prefix = @prefix@

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index 605292b8825e01d4552c9515ace2538c1d2b7e3b..864c5fffc8caec27f3e001b10fcdf6f83796eb08 100644 (file)
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-03  Bruno Haible  <bruno@clisp.org>
+
+       * configure.ac (intl/Makefile): Remove the VPATH line.
+       Reported by Jason Keltz <jas@cs.yorku.ca>.
+
 2005-07-26  Bruno Haible  <bruno@clisp.org>
 
        * configure.ac: Move the AM_GNU_GETTEXT invocation early, since it

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 4faaee36dea314b37c577cc2f0fe5c280a3a9194..17f64f2825c0461726652b20907cbc7b7fe8b758 100644 (file)
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -298,6 +298,7 @@ AC_CONFIG_FILES([doc/Makefile],
 AC_CONFIG_FILES([intl/Makefile:../gettext-runtime/intl/Makefile.in], [
   # Change srcdir variable so that it points to ../gettext-runtime/intl.
   sed -e 's|^srcdir =.*$|srcdir = $(top_srcdir)/../gettext-runtime/intl|' \
+      -e 's|^VPATH =.*$||' \
     < intl/Makefile > intl/Makefile.tmp
   mv intl/Makefile.tmp intl/Makefile
   ])