From 5dfda2ddf0b5c7910ebccf266da42a42fc4768ac Mon Sep 17 00:00:00 2001
From: Raja R Harinath <harinath@acm.org>
Date: Thu, 7 Aug 2003 11:21:45 +0000
Subject: [PATCH] * Makefile.am (maintainer-check): Update perllibdir. *
 lib/Automake/Makefile.am (Config.pm): Depend on Makefile too. (EXTRA_DIST):
 Add Config.in. * Makefile.in, lib/Automake/Makefile.in: Regenerate. *
 tests/defs.in (AUTOMAKE, ACLOCAL): Use absolute paths in $perllibdir.

---
 ChangeLog                | 9 +++++++++
 Makefile.am              | 4 ++--
 Makefile.in              | 4 ++--
 lib/Automake/Makefile.am | 4 +++-
 lib/Automake/Makefile.in | 3 ++-
 tests/defs.in            | 4 ++--
 6 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 42e05725..8d6d88e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-08-07  Raja R Harinath  <harinath@acm.org>
+
+	* Makefile.am (maintainer-check): Update perllibdir.
+	* lib/Automake/Makefile.am (Config.pm): Depend on Makefile too.
+	(EXTRA_DIST): Add Config.in.
+	* Makefile.in, lib/Automake/Makefile.in: Regenerate.
+	* tests/defs.in (AUTOMAKE, ACLOCAL): Use absolute paths in
+	$perllibdir.
+
 2003-08-06  Raja R Harinath  <harinath@acm.org>
 
 	* configure.in (AUTOMAKE, ACLOCAL): Search the 'lib' directory
diff --git a/Makefile.am b/Makefile.am
index 9bea08ab..1673fd6c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -103,8 +103,8 @@ maintainer-check: automake aclocal
 	  exit 1; \
 	fi
 ## Syntax check with default Perl (on my machine, Perl 5).
-	perllibdir=$(srcdir)/lib $(PERL) -c -w automake
-	perllibdir=$(srcdir)/lib $(PERL) -c -w aclocal
+	perllibdir=./lib:$(srcdir)/lib $(PERL) -c -w automake
+	perllibdir=./lib:$(srcdir)/lib $(PERL) -c -w aclocal
 ## expect no instances of '${...}'.  However, $${...} is ok, since that
 ## is a shell construct, not a Makefile construct.
 	@if grep -F '$${' $(srcdir)/lib/am/[a-z]*.am | \
diff --git a/Makefile.in b/Makefile.in
index 663fd003..053a2c9e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -782,8 +782,8 @@ maintainer-check: automake aclocal
 	  diff -c $(srcdir)/automake.in automake; \
 	  exit 1; \
 	fi
-	perllibdir=$(srcdir)/lib $(PERL) -c -w automake
-	perllibdir=$(srcdir)/lib $(PERL) -c -w aclocal
+	perllibdir=./lib:$(srcdir)/lib $(PERL) -c -w automake
+	perllibdir=./lib:$(srcdir)/lib $(PERL) -c -w aclocal
 	@if grep -F '$${' $(srcdir)/lib/am/[a-z]*.am | \
 	       grep -F -v '$$$$'; then \
 	  echo "Found too many uses of '\$${' in the lines above." 1>&2; \
diff --git a/lib/Automake/Makefile.am b/lib/Automake/Makefile.am
index 97b236e3..f6a3a157 100644
--- a/lib/Automake/Makefile.am
+++ b/lib/Automake/Makefile.am
@@ -51,5 +51,7 @@ do_subst = sed -e 's,[@]datadir[@],$(datadir),g' -e 's,[@]PERL[@],$(PERL),g' \
 	    -e 's,[@]APIVERSION[@],$(APIVERSION),g' \
 	    -e 's,[@]SHELL[@],$(SHELL),g'
 
-Config.pm: Config.in
+Config.pm: Config.in Makefile
 	$(do_subst) <$(srcdir)/Config.in >$@
+
+EXTRA_DIST = Config.in
diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 8367fba3..ba2ee303 100644
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -157,6 +157,7 @@ do_subst = sed -e 's,[@]datadir[@],$(datadir),g' -e 's,[@]PERL[@],$(PERL),g' \
 	    -e 's,[@]APIVERSION[@],$(APIVERSION),g' \
 	    -e 's,[@]SHELL[@],$(SHELL),g'
 
+EXTRA_DIST = Config.in
 all: all-recursive
 
 .SUFFIXES:
@@ -478,7 +479,7 @@ uninstall-info: uninstall-info-recursive
 	uninstall-nodist_perllibDATA
 
 
-Config.pm: Config.in
+Config.pm: Config.in Makefile
 	$(do_subst) <$(srcdir)/Config.in >$@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/tests/defs.in b/tests/defs.in
index 6ca72190..2154accf 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -235,7 +235,7 @@ echo "=== Running test $0"
 # strictness to avoid having to create lots and lots of files.  A test
 # can override this by specifying a different strictness.
 if test -z "$AUTOMAKE"; then
-   perllibdir=../../lib:$srcdir/../lib
+   perllibdir=`pwd`/../../lib:$srcdir/../lib
    export perllibdir
    # Use -Wall -Werror by default.  Tests for which this is inappropriate
    # (e.g. when testing that a warning is enabled by a specific switch)
@@ -245,7 +245,7 @@ fi
 
 # See how aclocal should be run.
 if test -z "$ACLOCAL"; then
-   perllibdir=../../lib:$srcdir/../lib
+   perllibdir=`pwd`/../../lib:$srcdir/../lib
    export perllibdir
    # Most of the files are in $srcdir/../m4.  However amversion.m4 is
    # generated in ../m4, so we include that directory in the search
-- 
2.43.5