fixed 'make dist'

diff --git a/ChangeLog b/ChangeLog
index daaf95ee9eb0ddf119b96015fcb3fe45d4ce0996..066488f56fa08cdd6ad978d833d9f81888351d2d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Sep 29 12:57:00 1997  Tom Tromey  <tromey@cygnus.com>
+
+       * Released 1.2c.
+
+       * automake.in (handle_dist_worker): In topmost directory of
+       project, use `distdir', not `top_distdir', as argument to
+       --output-dir; likewise when building in subdirs.
+
 Sun Sep 28 15:55:46 1997  Tom Tromey  <tromey@cygnus.com>
 
        * m4/sanity.m4: Test $*, not $@.  From Akim Demaille.

diff --git a/Makefile.in b/Makefile.in
index 9e25c3f308c3b8256c0c03a9f0abec0a56ebbd1a..06652c7819a44a133569dc75343b8a9ec8ede8fc 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.2b from Makefile.am
+# Makefile.in generated automatically by automake 1.2c from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -100,10 +100,10 @@ TEXINFOS = automake.texi
 DATA =  $(pkgdata_DATA)
 
 DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
-Makefile.in NEWS README-alpha THANKS TODO aclocal.in aclocal.m4 \
-ansi2knr.1 ansi2knr.c automake.in config.guess config.sub configure \
-configure.in elisp-comp install-sh mdate-sh missing mkinstalldirs \
-stamp-vti texinfo.tex version.texi ylwrap
+Makefile.in NEWS THANKS TODO aclocal.in aclocal.m4 ansi2knr.1 \
+ansi2knr.c automake.in config.guess config.sub configure configure.in \
+elisp-comp install-sh mdate-sh missing mkinstalldirs stamp-vti \
+texinfo.tex version.texi ylwrap
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -401,30 +401,26 @@ dist-all: distdir
        GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
        -rm -rf $(distdir)
 distdir: $(DISTFILES)
-       @if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" > /dev/null; then :; else \
-         echo "NEWS not updated; not releasing" 1>&2; \
-         exit 1; \
-       fi
        -rm -rf $(distdir)
        mkdir $(distdir)
        -chmod 777 $(distdir)
        here=`cd $(top_builddir) && pwd`; \
-       top_distdir=`cd $(top_distdir) && pwd`; \
+       top_distdir=`cd $(distdir) && pwd`; \
        distdir=`cd $(distdir) && pwd`; \
        cd $(top_srcdir) \
-         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$distdir --gnits Makefile
+         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits Makefile
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          test -f $(distdir)/$$file \
          || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
          || cp -p $$d/$$file $(distdir)/$$file; \
        done
-       for subdir in $(SUBDIRS); do            \
-         test -d $(distdir)/$$subdir           \
-         || mkdir $(distdir)/$$subdir          \
-         || exit 1;                            \
-         chmod 777 $(distdir)/$$subdir;        \
-         (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
+       for subdir in $(SUBDIRS); do \
+         test -d $(distdir)/$$subdir \
+         || mkdir $(distdir)/$$subdir \
+         || exit 1; \
+         chmod 777 $(distdir)/$$subdir; \
+         (cd $$subdir && $(MAKE) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
            || exit 1; \
        done
        $(MAKE) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-info

diff --git a/NEWS b/NEWS
index 2237591a7f1ba5268fab372121f2e1ea720c7d66..e861aff08455a08b762df912a6055fcce211e56a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,8 @@
-New in 1.2b:
+New in 1.2c:
 * Bug fixes
 * Better Cygwin32 support
 * Support for suffix rules with _SOURCES variables
+* New options `readme-alpha' and `check-news'; Gnits mode sets these
 \f
 New in 1.2:
 * Bug fixes

diff --git a/TODO b/TODO
index f7df486b7a865acc04f7fe51144dec4e86076388..0030ad493d277ee850af0a6405dfe42f63defc4d 100644 (file)
--- a/TODO
+++ b/TODO
@@ -83,6 +83,8 @@ non-C source in a libtool library specification.
 * must split $obj into two parts: one for libtool and one for
   deansification.  Otherwise .S files will be deansified!
 
+* ansi2knr must currently appear in a directory that has some source
+
 * if program has the same name as a target, do something sensible:
   - if the target is internal, rename it
   - if the target is mandated (eg, "info"), tell the user

diff --git a/aclocal.m4 b/aclocal.m4
index 9949e1c9d999bea905d7ec4c22788bfeddfb2b93..443c01dab24e48dea1e1264af3d28cdbe88226d1 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl aclocal.m4 generated automatically by aclocal 1.2b
+dnl aclocal.m4 generated automatically by aclocal 1.2c
 
 dnl Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 dnl This Makefile.in is free software; the Free Software Foundation
@@ -68,7 +68,7 @@ echo timestamp > conftestfile
 # directory).
 if (
    set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]@" = "X"; then
+   if test "[$]*" = "X"; then
       # -L didn't work.
       set X `ls -t $srcdir/configure conftestfile`
    fi

diff --git a/automake.in b/automake.in
index e4c639fe985384453745f1e73d9bdcb401146a84..00a65276be9187e86e8d16fb3f0b63e409b31f6e 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1633,7 +1633,6 @@ sub handle_libraries
        # Check that the library fits the standard naming convention.
        if ($onelib !~ /^lib.*\.a$/)
        {
-           # FIXME this should only be a warning for foreign packages
            # FIXME should put line number here.  That means mapping
            # from library name back to variable name.
            &am_error ("\`$onelib' is not a standard library name");
@@ -2324,13 +2323,22 @@ sub handle_dist_worker
     {
        $output_rules .=
            (
-            # We need an absolute path for --output-dir.  Thus the
-            # weirdness.
+            # There are several directories we need to know about
+            # when rebuilding the Makefile.ins.  They are:
+            #   here - The absolute path to our topmost build directory.
+            #   top_distdir - The absolute path to the top of our dist
+            #                 hierarchy.
+            #   distdir - The path to our sub-part of the dist hierarchy.
+            # If this directory is the topmost directory, we set
+            # top_distdir from distdir; that lets us pass in distdir
+            # from an enclosing package.
             "\t" . 'here=`cd $(top_builddir) && pwd`; ' . "\\\n"
-            . "\t" . 'top_distdir=`cd $(top_distdir) && pwd`; ' . "\\\n"
-            . "\t" . 'distdir=`cd $(distdir) && pwd`; ' . "\\\n"
+            . "\t" . 'top_distdir=`cd $('
+            . (($relative_dir eq '.') ? 'distdir' : 'top_distdir')
+            . ') && pwd`; ' . "\\\n"
+            . "\t" . 'distdir=`cd $(distdir) && pwd`; ' . "\\\n"
             . "\tcd \$(top_srcdir) \\\n"
-            . "\t  && \$(AUTOMAKE) --include-deps --build-dir=\$\$here --srcdir-name=\$(top_srcdir) --output-dir=\$\$distdir "
+            . "\t  && \$(AUTOMAKE) --include-deps --build-dir=\$\$here --srcdir-name=\$(top_srcdir) --output-dir=\$\$top_distdir "
             # Set strictness of output.
             . ($cygnus_mode ? '--cygnus' : ('--' . $strictness_name))
             . ($cmdline_use_dependencies ? '' : ' --include-deps')
@@ -2416,16 +2424,20 @@ sub handle_dist_worker
        # we explicitly set distdir for the subdir make; that lets us
        # mix-n-match many automake-using packages into one large
        # package, and have "dist" at the top level do the right
-       # thing.
-       $output_rules .= '      for subdir in $(' . $dist_subdir_name . '); do          \\
-         test -d $(distdir)/$$subdir           \\
-         || mkdir $(distdir)/$$subdir          \\
-         || exit 1;                            \\
-         chmod 777 $(distdir)/$$subdir;        \\
-         (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \\
-           || exit 1; \\
-       done
-';
+       # thing.  If we're in the topmost directory, then we use
+       # `distdir' instead of `top_distdir'; this lets us work
+       # correctly with an enclosing package.
+       $output_rules .= 
+           ("\t" . 'for subdir in $(' . $dist_subdir_name . '); do ' . "\\\n"
+            . "\t" . '  test -d $(distdir)/$$subdir ' . "\\\n"
+            . "\t" . '  || mkdir $(distdir)/$$subdir ' . "\\\n"
+            . "\t" . '  || exit 1; ' . "\\\n"
+            . "\t" . '  chmod 777 $(distdir)/$$subdir; ' . "\\\n"
+            . "\t" . '  (cd $$subdir && $(MAKE) top_distdir=../$('
+            . (($relative_dir eq '.') ? 'distdir' : 'top_distdir')
+            . ') distdir=../$(distdir)/$$subdir distdir) ' . "\\\n"
+            . "\t" . '    || exit 1; ' . "\\\n"
+            . "\tdone\n");
     }
 
     # If the target `dist-hook' exists, make sure it is run.  This

diff --git a/configure b/configure
index 9e9632f11fbf53a377ac86e7279bba245c697490..265dbed70f2323e15702a1165a7dda5280e71482 100755 (executable)
--- a/configure
+++ b/configure
@@ -604,7 +604,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 
 PACKAGE=automake
 
-VERSION=1.2b
+VERSION=1.2c
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -629,7 +629,7 @@ echo timestamp > conftestfile
 # directory).
 if (
    set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$@" = "X"; then
+   if test "$*" = "X"; then
       # -L didn't work.
       set X `ls -t $srcdir/configure conftestfile`
    fi

diff --git a/configure.in b/configure.in
index 44b20df0372aa98ce68ff0918628fdcccf7828e6..a9ea963ef5e72e90d5d059fc66c0bd257b62230b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(automake.in)
 
-AM_INIT_AUTOMAKE(automake, 1.2b)
+AM_INIT_AUTOMAKE(automake, 1.2c)
 
 # Find an appropriate tar for use in "dist" targets.  A "best guess"
 # is good enough -- if we can't find GNU tar, we don't really care.

diff --git a/m4/Makefile.in b/m4/Makefile.in
index c3d4a0c2f45efd4593d9d94d005120d632fefbbd..892e3db9040b11d124df2be02b42a22cd84c0fa2 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.2b from Makefile.am
+# Makefile.in generated automatically by automake 1.2c from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -123,7 +123,7 @@ distdir: $(DISTFILES)
        top_distdir=`cd $(top_distdir) && pwd`; \
        distdir=`cd $(distdir) && pwd`; \
        cd $(top_srcdir) \
-         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$distdir --gnits m4/Makefile
+         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits m4/Makefile
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          test -f $(distdir)/$$file \

diff --git a/stamp-vti b/stamp-vti
index 62396764464d84b6056530f7f01f38531dba1de9..72d2bf558409bd28f6a20ef06083ece65f08b138 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,3 +1,3 @@
 @set UPDATED 28 September 1997
-@set EDITION 1.2b
-@set VERSION 1.2b
+@set EDITION 1.2c
+@set VERSION 1.2c

diff --git a/tests/Makefile.in b/tests/Makefile.in
index c8860eff3e3472ddcd0e1705e712bfecb3dcc9bc..a619269fc98b97a274e781bf741fdd79f8f6d182 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.2b from Makefile.am
+# Makefile.in generated automatically by automake 1.2c from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -121,7 +121,7 @@ distdir: $(DISTFILES)
        top_distdir=`cd $(top_distdir) && pwd`; \
        distdir=`cd $(distdir) && pwd`; \
        cd $(top_srcdir) \
-         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$distdir --gnits tests/Makefile
+         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits tests/Makefile
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          test -f $(distdir)/$$file \

diff --git a/version.texi b/version.texi
index 62396764464d84b6056530f7f01f38531dba1de9..72d2bf558409bd28f6a20ef06083ece65f08b138 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
 @set UPDATED 28 September 1997
-@set EDITION 1.2b
-@set VERSION 1.2b
+@set EDITION 1.2c
+@set VERSION 1.2c