* 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.

diff --git a/ChangeLog b/ChangeLog
index 42e05725f926de218f192f0d036e098e75047d1b..8d6d88e4ebfade8b872b4bda37a46756197045cb 100644 (file)
--- 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 9bea08ab1da2673fa96ec7610b28049040090b4f..1673fd6c3abae52b92b0bbafd26c6ad6de0642e2 100644 (file)
--- 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 663fd003ef3da5302b8a4c9a99b5eec898af7bc7..053a2c9ee40f4e740342e7e99bbb3f8ffb6b27bf 100644 (file)
--- 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 97b236e3feac33aa31efbc2909b5020cfb7e4715..f6a3a157de2465b00dc1e6e589037ca9a8953b8c 100644 (file)
--- 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 8367fba3036e032cc84c7dd27ea3127eec5592c6..ba2ee30321e40f5ce4d75d971dd07a3f973a2bf2 100644 (file)
--- 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 6ca72190750f77b8ad0110524d0933ae224875b3..2154accf060656720adcd4ab6b62dcfdb4509333 100644 (file)
--- 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