Index: ChangeLog
from  Raja R Harinath  <address@hidden>
	* 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.

Index: Makefile.am
===================================================================
RCS file: /cvs/automake/automake/Makefile.am,v
retrieving revision 1.218
diff -u -p -u -r1.218 Makefile.am
--- Makefile.am	6 Aug 2003 22:21:07 -0000	1.218
+++ Makefile.am	7 Aug 2003 04:19:15 -0000
@@ -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 | \
Index: Makefile.in
===================================================================
RCS file: /cvs/automake/automake/Makefile.in,v
retrieving revision 1.447
diff -u -p -u -r1.447 Makefile.in
--- Makefile.in	6 Aug 2003 21:20:15 -0000	1.447
+++ Makefile.in	7 Aug 2003 04:19:15 -0000
@@ -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; \
Index: tests/defs.in
===================================================================
RCS file: /cvs/automake/automake/tests/defs.in,v
retrieving revision 1.18
diff -u -p -u -r1.18 defs.in
--- tests/defs.in	7 Aug 2003 00:32:28 -0000	1.18
+++ tests/defs.in	7 Aug 2003 04:19:15 -0000
@@ -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
Index: lib/Automake/Makefile.am
===================================================================
RCS file: /cvs/automake/automake/lib/Automake/Makefile.am,v
retrieving revision 1.16
diff -u -p -u -r1.16 Makefile.am
--- lib/Automake/Makefile.am	6 Aug 2003 21:20:15 -0000	1.16
+++ lib/Automake/Makefile.am	7 Aug 2003 04:19:15 -0000
@@ -51,5 +51,7 @@ do_subst = sed -e 's,address@hidden@],$(dat
 	    -e 's,address@hidden@],$(APIVERSION),g' \
 	    -e 's,address@hidden@],$(SHELL),g'
 
-Config.pm: Config.in
+Config.pm: Config.in Makefile
 	$(do_subst) <$(srcdir)/Config.in >$@
+
+EXTRA_DIST = Config.in
Index: lib/Automake/Makefile.in
===================================================================
RCS file: /cvs/automake/automake/lib/Automake/Makefile.in,v
retrieving revision 1.82
diff -u -p -u -r1.82 Makefile.in
--- lib/Automake/Makefile.in	6 Aug 2003 21:20:15 -0000	1.82
+++ lib/Automake/Makefile.in	7 Aug 2003 04:19:15 -0000
@@ -157,6 +157,7 @@ do_subst = sed -e 's,address@hidden@],$(dat
 	    -e 's,address@hidden@],$(APIVERSION),g' \
 	    -e 's,address@hidden@],$(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.