dist fix

diff --git a/ChangeLog b/ChangeLog
index 681b1352e39ea6cd2b6d56e3dcfc55010ddc5ef9..920baceb383d3b8d57a6269e06a7e934e7ad1c17 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 Wed Apr 30 19:15:47 1997  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (handle_dist_worker): Change how top_distdir is
+       computed.  Based on patch from Ian Taylor.
+       (handle_dist): Define top_distdir.
+
        * automake.in (handle_yacc_lex_cxx): Include CXXFLAGS in CXXLINK.
        (handle_yacc_lex_cxx): Include CFLAGS in LINK.
 

diff --git a/Makefile.in b/Makefile.in
index 3aa3347adf974b24053ea769c393d0f201f4cff7..8c90d26317bf5d399fe3735d22f672c95d1c944f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.1o from Makefile.am
+# Makefile.in generated automatically by automake 1.1p from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -359,6 +359,8 @@ distclean-tags:
 maintainer-clean-tags:
 
 distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
 # tarfile.
@@ -396,8 +398,9 @@ distdir: $(DISTFILES)
        rm -rf $(distdir)
        mkdir $(distdir)
        -chmod 777 $(distdir)
-       here=`cd $(top_builddir) && pwd`; top_distdir=`cd $$top_distdir && pwd` \
-         && cd $(top_srcdir) \
+       here=`cd $(top_builddir) && pwd`; \
+       top_distdir=`cd $(top_distdir) && pwd`; \
+       cd $(top_srcdir) \
          && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits Makefile
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
@@ -410,10 +413,10 @@ distdir: $(DISTFILES)
          || mkdir $(distdir)/$$subdir          \
          || exit 1;                            \
          chmod 777 $(distdir)/$$subdir;        \
-         (cd $$subdir && $(MAKE) top_distdir=$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
+         (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
            || exit 1; \
        done
-       $(MAKE) top_distdir="$(distdir)" distdir="$(distdir)" dist-info
+       $(MAKE) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-info
 info: $(INFO_DEPS) info-recursive
 dvi: $(DVIS) dvi-recursive
 check: all-am
@@ -454,7 +457,7 @@ clean-generic:
 
 distclean-generic:
        rm -f Makefile $(DISTCLEANFILES)
-       rm -f config.cache config.log stamp-h
+       rm -f config.cache config.log stamp-h stamp-h[0-9]*
        test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:

diff --git a/NEWS b/NEWS
index 0f84a8b6599781b2a948683d321ae220d9af0ce6..cae6f54fba396048943e241c9159c373b0d348c2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-New in 1.1o:
+New in 1.1p:
 * Bug fixes
 * Better DejaGNU support
 * Added no-installinfo option

diff --git a/automake.in b/automake.in
index 6bf90dc6f4db37c3bc7ab04dd89536553b2aa892..a02d4a4d7bdc69e84b20b0bbb79db0d83f1e3adb 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2276,8 +2276,9 @@ sub handle_dist_worker
            (
             # We need an absolute path for --output-dir.  Thus the
             # weirdness.
-            "\t" . 'here=`cd $(top_builddir) && pwd`; top_distdir=`cd $$top_distdir && pwd` ' . "\\\n"
-            . "\t  && cd \$(top_srcdir) \\\n"
+            "\t" . 'here=`cd $(top_builddir) && pwd`; ' . "\\\n"
+            . "\t" . 'top_distdir=`cd $(top_distdir) && pwd`; ' . "\\\n"
+            . "\tcd \$(top_srcdir) \\\n"
             . "\t  && \$(AUTOMAKE) --include-deps --build-dir=\$\$here --srcdir-name=\$(top_srcdir) --output-dir=\$\$top_distdir "
             # Set strictness of output.
             . ($cygnus_mode ? '--cygnus' : ('--' . $strictness_name))
@@ -2369,7 +2370,7 @@ sub handle_dist_worker
          || mkdir $(distdir)/$$subdir          \\
          || exit 1;                            \\
          chmod 777 $(distdir)/$$subdir;        \\
-         (cd $$subdir && $(MAKE) top_distdir=$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \\
+         (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \\
            || exit 1; \\
        done
 ';
@@ -2385,7 +2386,7 @@ sub handle_dist_worker
     {
        # We must explicitly set distdir and top_distdir for these
        # sub-makes.
-       $output_rules .= "\t\$(MAKE) top_distdir=\"\$(distdir)\" distdir=\"\$(distdir)\" $targ\n";
+       $output_rules .= "\t\$(MAKE) top_distdir=\"\$(top_distdir)\" distdir=\"\$(distdir)\" $targ\n";
     }
 
     push (@phony, 'distdir');
@@ -2463,9 +2464,13 @@ sub handle_dist
                              . "\n");
        }
     }
-    if ($relative_dir ne '.')
+    if ($relative_dir eq '.')
+    {
+       $output_rules .= "top_distdir = \$(distdir)\n\n";
+    }
+    else
     {
-       $output_rules .= "\nsubdir = " . $relative_dir . "\n";
+       $output_rules .= "\nsubdir = " . $relative_dir . "\n\n";
     }
 
     # Generate 'dist' target, and maybe dist-shar / dist-zip / dist-tarZ.

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 88478b22c1d471ae69c5fc05d58a9cc385844c10..eece2a75396613610374261d942634e917956c85 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.1o from Makefile.am
+# Makefile.in generated automatically by automake 1.1p from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -115,9 +115,11 @@ TAGS:
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
 subdir = m4
+
 distdir: $(DISTFILES)
-       here=`cd $(top_builddir) && pwd`; top_distdir=`cd $$top_distdir && pwd` \
-         && cd $(top_srcdir) \
+       here=`cd $(top_builddir) && pwd`; \
+       top_distdir=`cd $(top_distdir) && pwd`; \
+       cd $(top_srcdir) \
          && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits m4/Makefile
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
@@ -157,7 +159,7 @@ clean-generic:
 
 distclean-generic:
        rm -f Makefile $(DISTCLEANFILES)
-       rm -f config.cache config.log stamp-h
+       rm -f config.cache config.log stamp-h stamp-h[0-9]*
        test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:

diff --git a/tests/Makefile.in b/tests/Makefile.in
index bba94b7ea7ca022d64bbd678b10b5ae8b0ae032e..41104735f8c711bf7ce5a97de55fab8bdc744da1 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.1o from Makefile.am
+# Makefile.in generated automatically by automake 1.1p from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -112,9 +112,11 @@ TAGS:
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
 subdir = tests
+
 distdir: $(DISTFILES)
-       here=`cd $(top_builddir) && pwd`; top_distdir=`cd $$top_distdir && pwd` \
-         && cd $(top_srcdir) \
+       here=`cd $(top_builddir) && pwd`; \
+       top_distdir=`cd $(top_distdir) && pwd`; \
+       cd $(top_srcdir) \
          && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits tests/Makefile
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
@@ -175,7 +177,7 @@ clean-generic:
 
 distclean-generic:
        rm -f Makefile $(DISTCLEANFILES)
-       rm -f config.cache config.log stamp-h
+       rm -f config.cache config.log stamp-h stamp-h[0-9]*
        test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic: