automake-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Patch: FYI: aclocal -vs- perllibdir


From: Tom Tromey
Subject: Patch: FYI: aclocal -vs- perllibdir
Date: 04 Jan 2002 11:55:26 -0700

I'm checking this in.
This fixes a problem reported on the main list.

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>

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

Index: THANKS
===================================================================
RCS file: /cvs/automake/automake/THANKS,v
retrieving revision 1.160
diff -u -r1.160 THANKS
--- THANKS 2002/01/02 16:12:28 1.160
+++ THANKS 2002/01/04 18:42:53
@@ -103,6 +103,7 @@
 Markku Rossi           address@hidden
 Markus F.X.J. Oberhumer        address@hidden
 Martin Frydl           address@hidden
+Mathias Doreille       address@hidden
 Matt Leach             address@hidden
 Matthew D. Langston    address@hidden
 Matthias Clasen                address@hidden
Index: configure
===================================================================
RCS file: /cvs/automake/automake/configure,v
retrieving revision 1.104
diff -u -r1.104 configure
--- configure 2001/12/31 00:16:37 1.104
+++ configure 2002/01/04 18:42:56
@@ -1353,9 +1353,9 @@
 # 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.
Index: configure.in
===================================================================
RCS file: /cvs/automake/automake/configure.in,v
retrieving revision 1.94
diff -u -r1.94 configure.in
--- configure.in 2001/12/31 00:16:37 1.94
+++ configure.in 2002/01/04 18:42:56
@@ -27,9 +27,9 @@
 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)
Index: stamp-vti
===================================================================
RCS file: /cvs/automake/automake/stamp-vti,v
retrieving revision 1.153
diff -u -r1.153 stamp-vti
--- stamp-vti 2002/01/01 22:01:08 1.153
+++ stamp-vti 2002/01/04 18:42:56
@@ -1,4 +1,4 @@
address@hidden UPDATED 1 January 2002
address@hidden UPDATED 2 January 2002
 @set UPDATED-MONTH January 2002
 @set EDITION 1.5c
 @set VERSION 1.5c
Index: version.texi
===================================================================
RCS file: /cvs/automake/automake/version.texi,v
retrieving revision 1.226
diff -u -r1.226 version.texi
--- version.texi 2002/01/01 22:01:08 1.226
+++ version.texi 2002/01/04 18:42:56
@@ -1,4 +1,4 @@
address@hidden UPDATED 1 January 2002
address@hidden UPDATED 2 January 2002
 @set UPDATED-MONTH January 2002
 @set EDITION 1.5c
 @set VERSION 1.5c



reply via email to

[Prev in Thread] Current Thread [Next in Thread]