* configure.in (ACLOCAL): Set perllibdir. From Nicolas Joly.

diff --git a/ChangeLog b/ChangeLog
index dd01c94..ebaebe9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-04  Tom Tromey  <tromey@redhat.com>
+
+       * configure.in (ACLOCAL): Set perllibdir.  From Nicolas Joly.
+
 2002-01-04  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        * automake.in (read_am_file): Thinko in "comment following

diff --git a/THANKS b/THANKS
index 4d999a0..fc40916 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -103,6 +103,7 @@ Mark Galassi                rosalia@nis.lanl.gov
 Markku Rossi           mtr@ngs.fi
 Markus F.X.J. Oberhumer        k3040e4@wildsau.idv-edu.uni-linz.ac.at
 Martin Frydl           martin@idoox.com
+Mathias Doreille       doreille@smr.ch
 Matt Leach             mleach@cygnus.com
 Matthew D. Langston    langston@SLAC.Stanford.EDU
 Matthias Clasen                clasen@mathematik.uni-freiburg.de

diff --git a/configure b/configure
index 270b852..9566a25 100755 (executable)
--- a/configure
+++ b/configure
@@ -1353,9 +1353,9 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 
-ACLOCAL="`pwd`/aclocal --acdir=m4"
-# $AUTOMAKE is always run after a `cd $top_srcdir', hence `.' is really
-# what we want for perllibdir and libdir.
+# $AUTOMAKE and $ACLOCAL are always run after a `cd $top_srcdir',
+# hence `.' is really what we want for perllibdir and libdir.
+ACLOCAL="perllibdir=./lib `pwd`/aclocal --acdir=m4"
 AUTOMAKE="perllibdir=./lib `pwd`/automake --libdir=lib"
 
 # Extract the first word of "perl", so it can be a program name with args.

diff --git a/configure.in b/configure.in
index 30261a9..aa880b2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -27,9 +27,9 @@ AC_CONFIG_AUX_DIR(lib)
 AM_INIT_AUTOMAKE(automake, 1.5c)
 AM_AUTOMAKE_OPTIONS([1.5 dist-bzip2])
 
-ACLOCAL="`pwd`/aclocal --acdir=m4"
-# $AUTOMAKE is always run after a `cd $top_srcdir', hence `.' is really
-# what we want for perllibdir and libdir.
+# $AUTOMAKE and $ACLOCAL are always run after a `cd $top_srcdir',
+# hence `.' is really what we want for perllibdir and libdir.
+ACLOCAL="perllibdir=./lib `pwd`/aclocal --acdir=m4"
 AUTOMAKE="perllibdir=./lib `pwd`/automake --libdir=lib"
 
 AC_PATH_PROG(PERL, perl)

diff --git a/stamp-vti b/stamp-vti
index ef0409c..3de66d6 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 1 January 2002
+@set UPDATED 2 January 2002
 @set UPDATED-MONTH January 2002
 @set EDITION 1.5c
 @set VERSION 1.5c

diff --git a/version.texi b/version.texi
index ef0409c..3de66d6 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 1 January 2002
+@set UPDATED 2 January 2002
 @set UPDATED-MONTH January 2002
 @set EDITION 1.5c
 @set VERSION 1.5c