From: Bruno Haible Date: Thu, 13 Jan 2005 12:21:15 +0000 (+0000) Subject: Make it work with automake-1.9. X-Git-Tag: v0.14.2~145 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=402e18ff62c99dbee3383a51539ca6bc8895e3d5;p=thirdparty%2Fgettext.git Make it work with automake-1.9. --- diff --git a/autoconf-lib-link/ChangeLog b/autoconf-lib-link/ChangeLog index cc1d543f2..287c6d744 100644 --- a/autoconf-lib-link/ChangeLog +++ b/autoconf-lib-link/ChangeLog @@ -1,3 +1,12 @@ +2005-01-09 Bruno Haible + + Adaptation to automake-1.9. + * Makefile.am (tests/rpath*/aclocal.m4): Turn the m4 directories + into absolute pathnames, so that aclocal-1.9 includes the files + literally into the created aclocal.m4 file, instead of putting + m4_include(...) statements that don't work after the directory has + been copied to a different location. + 2005-01-05 Bruno Haible * config.rpath: Upgrade to libtool-1.5.10. diff --git a/autoconf-lib-link/Makefile.am b/autoconf-lib-link/Makefile.am index 4463794d8..6e412754f 100644 --- a/autoconf-lib-link/Makefile.am +++ b/autoconf-lib-link/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the autoconf-lib-link directory of GNU gettext -## Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc. +## Copyright (C) 1995-1999, 2000-2003, 2005 Free Software Foundation, Inc. ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -84,7 +84,7 @@ CONFIGURES_RPATHX = $(srcdir)/tests/rpathx/Makefile.in $(srcdir)/tests/rpathx/ac $(srcdir)/tests/rpathx/Makefile.in: $(srcdir)/tests/rpathx/Makefile.am $(srcdir)/tests/rpathx/configure.ac $(srcdir)/tests/rpathx/aclocal.m4 cd $(srcdir)/tests/rpathx && automake Makefile $(srcdir)/tests/rpathx/aclocal.m4: $(srcdir)/tests/rpathx/configure.ac $(srcdir)/../config/m4/libtool.m4 - cd $(srcdir)/tests/rpathx && aclocal -I ../../m4 -I ../../../config/m4 + cd $(srcdir)/tests/rpathx && aclocal -I `cd ../../m4 && pwd` -I `cd ../../../config/m4 && pwd` $(srcdir)/tests/rpathx/configure: $(srcdir)/tests/rpathx/configure.ac $(srcdir)/tests/rpathx/aclocal.m4 cd $(srcdir)/tests/rpathx && autoconf @@ -92,7 +92,7 @@ CONFIGURES_RPATHY = $(srcdir)/tests/rpathy/Makefile.in $(srcdir)/tests/rpathy/ac $(srcdir)/tests/rpathy/Makefile.in: $(srcdir)/tests/rpathy/Makefile.am $(srcdir)/tests/rpathy/configure.ac $(srcdir)/tests/rpathy/aclocal.m4 cd $(srcdir)/tests/rpathy && automake Makefile $(srcdir)/tests/rpathy/aclocal.m4: $(srcdir)/tests/rpathy/configure.ac $(srcdir)/../config/m4/libtool.m4 $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4 - cd $(srcdir)/tests/rpathy && aclocal -I ../../m4 -I ../../../config/m4 + cd $(srcdir)/tests/rpathy && aclocal -I `cd ../../m4 && pwd` -I `cd ../../../config/m4 && pwd` $(srcdir)/tests/rpathy/configure: $(srcdir)/tests/rpathy/configure.ac $(srcdir)/tests/rpathy/aclocal.m4 cd $(srcdir)/tests/rpathy && autoconf @@ -100,7 +100,7 @@ CONFIGURES_RPATHZ = $(srcdir)/tests/rpathz/Makefile.in $(srcdir)/tests/rpathz/ac $(srcdir)/tests/rpathz/Makefile.in: $(srcdir)/tests/rpathz/Makefile.am $(srcdir)/tests/rpathz/configure.ac $(srcdir)/tests/rpathz/aclocal.m4 cd $(srcdir)/tests/rpathz && automake Makefile $(srcdir)/tests/rpathz/aclocal.m4: $(srcdir)/tests/rpathz/configure.ac $(srcdir)/../config/m4/libtool.m4 $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4 - cd $(srcdir)/tests/rpathz && aclocal -I ../../m4 -I ../../../config/m4 + cd $(srcdir)/tests/rpathz && aclocal -I `cd ../../m4 && pwd` -I `cd ../../../config/m4 && pwd` $(srcdir)/tests/rpathz/configure: $(srcdir)/tests/rpathz/configure.ac $(srcdir)/tests/rpathz/aclocal.m4 cd $(srcdir)/tests/rpathz && autoconf @@ -108,7 +108,7 @@ CONFIGURES_RPATHLX = $(srcdir)/tests/rpathlx/Makefile.in $(srcdir)/tests/rpathlx $(srcdir)/tests/rpathlx/Makefile.in: $(srcdir)/tests/rpathlx/Makefile.am $(srcdir)/tests/rpathlx/configure.ac $(srcdir)/tests/rpathlx/aclocal.m4 cd $(srcdir)/tests/rpathlx && automake Makefile $(srcdir)/tests/rpathlx/aclocal.m4: $(srcdir)/tests/rpathlx/configure.ac $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4 - cd $(srcdir)/tests/rpathlx && aclocal -I ../../m4 + cd $(srcdir)/tests/rpathlx && aclocal -I `cd ../../m4 && pwd` $(srcdir)/tests/rpathlx/configure: $(srcdir)/tests/rpathlx/configure.ac $(srcdir)/tests/rpathlx/aclocal.m4 cd $(srcdir)/tests/rpathlx && autoconf @@ -116,7 +116,7 @@ CONFIGURES_RPATHLY = $(srcdir)/tests/rpathly/Makefile.in $(srcdir)/tests/rpathly $(srcdir)/tests/rpathly/Makefile.in: $(srcdir)/tests/rpathly/Makefile.am $(srcdir)/tests/rpathly/configure.ac $(srcdir)/tests/rpathly/aclocal.m4 cd $(srcdir)/tests/rpathly && automake Makefile $(srcdir)/tests/rpathly/aclocal.m4: $(srcdir)/tests/rpathly/configure.ac $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4 - cd $(srcdir)/tests/rpathly && aclocal -I ../../m4 + cd $(srcdir)/tests/rpathly && aclocal -I `cd ../../m4 && pwd` $(srcdir)/tests/rpathly/configure: $(srcdir)/tests/rpathly/configure.ac $(srcdir)/tests/rpathly/aclocal.m4 cd $(srcdir)/tests/rpathly && autoconf @@ -124,7 +124,7 @@ CONFIGURES_RPATHLYX = $(srcdir)/tests/rpathlyx/Makefile.in $(srcdir)/tests/rpath $(srcdir)/tests/rpathlyx/Makefile.in: $(srcdir)/tests/rpathlyx/Makefile.am $(srcdir)/tests/rpathlyx/configure.ac $(srcdir)/tests/rpathlyx/aclocal.m4 cd $(srcdir)/tests/rpathlyx && automake Makefile $(srcdir)/tests/rpathlyx/aclocal.m4: $(srcdir)/tests/rpathlyx/configure.ac $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4 - cd $(srcdir)/tests/rpathlyx && aclocal -I ../../m4 + cd $(srcdir)/tests/rpathlyx && aclocal -I `cd ../../m4 && pwd` $(srcdir)/tests/rpathlyx/configure: $(srcdir)/tests/rpathlyx/configure.ac $(srcdir)/tests/rpathlyx/aclocal.m4 cd $(srcdir)/tests/rpathlyx && autoconf @@ -132,7 +132,7 @@ CONFIGURES_RPATHLZ = $(srcdir)/tests/rpathlz/Makefile.in $(srcdir)/tests/rpathlz $(srcdir)/tests/rpathlz/Makefile.in: $(srcdir)/tests/rpathlz/Makefile.am $(srcdir)/tests/rpathlz/configure.ac $(srcdir)/tests/rpathlz/aclocal.m4 cd $(srcdir)/tests/rpathlz && automake Makefile $(srcdir)/tests/rpathlz/aclocal.m4: $(srcdir)/tests/rpathlz/configure.ac $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4 - cd $(srcdir)/tests/rpathlz && aclocal -I ../../m4 + cd $(srcdir)/tests/rpathlz && aclocal -I `cd ../../m4 && pwd` $(srcdir)/tests/rpathlz/configure: $(srcdir)/tests/rpathlz/configure.ac $(srcdir)/tests/rpathlz/aclocal.m4 cd $(srcdir)/tests/rpathlz && autoconf @@ -140,7 +140,7 @@ CONFIGURES_RPATHLZYX = $(srcdir)/tests/rpathlzyx/Makefile.in $(srcdir)/tests/rpa $(srcdir)/tests/rpathlzyx/Makefile.in: $(srcdir)/tests/rpathlzyx/Makefile.am $(srcdir)/tests/rpathlzyx/configure.ac $(srcdir)/tests/rpathlzyx/aclocal.m4 cd $(srcdir)/tests/rpathlzyx && automake Makefile $(srcdir)/tests/rpathlzyx/aclocal.m4: $(srcdir)/tests/rpathlzyx/configure.ac $(srcdir)/m4/lib-link.m4 $(srcdir)/m4/lib-prefix.m4 $(srcdir)/m4/lib-ld.m4 - cd $(srcdir)/tests/rpathlzyx && aclocal -I ../../m4 + cd $(srcdir)/tests/rpathlzyx && aclocal -I `cd ../../m4 && pwd` $(srcdir)/tests/rpathlzyx/configure: $(srcdir)/tests/rpathlzyx/configure.ac $(srcdir)/tests/rpathlzyx/aclocal.m4 cd $(srcdir)/tests/rpathlzyx && autoconf