Bug fixes

diff --git a/ChangeLog b/ChangeLog
index 0bdcc9d..c6eaae0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 Tue Aug 27 08:25:05 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
+       * automake.in (file_contents_with_transform): Correctly remove
+       @(UN)?MAINT@ from input when maintainer mode not active.
+       (handle_aclocal_m4): Handle no-maintainer-mode case.
+
+       * remake-hdr.am ($(CONFIG_HEADER)): Removed @MAINT@.
+
        * m4/AM_SANITY_CHECK_CC.m4: New file (from Jim Meyering).
 
 Mon Aug 26 21:37:32 1996  Tom Tromey  <tromey@creche.cygnus.com>

diff --git a/TODO b/TODO
index 35238c0..cda584c 100644 (file)
--- a/TODO
+++ b/TODO
@@ -7,9 +7,15 @@ Priorities for release:
 !! remove autosystem-specific macros
 !! should write autoconf-style doc entries for each m4 macro
 
+Jim's idea: should look for @setfilename and warn if filenames too long
+* guess split size
+* allow ".info" to be missing
+
 should put inverse of @MAINT@ before `.PHONY: configure'.  This means
 fixing configure target name (no $srcdir)
 
+* add distcheck-hook
+
 * must update GNU Hello
 
 ** when can aclocal.m4 be auto-generated?
@@ -34,6 +40,7 @@ well as any subdirectories) are all world-writable (octal mode 777).
 *   Make sure that no file name in the distribution is more than 14
 characters long.
 *    Don't include any symbolic links in the distribution itself.
+     (ditto hard links)
 *    Make sure that all the files in the distribution are world-readable.
 
 consider supporting "var+= stuff" syntax.  rewrite to just var=... on

diff --git a/automake.in b/automake.in
index 67b0d86..c5ec2d6 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1772,7 +1772,9 @@ sub handle_aclocal_m4
 
     if ($regen_aclocal)
     {
-       $output_rules .= ("aclocal.m4: \@MAINT\@configure.in"
+       $output_rules .= ("aclocal.m4: "
+                         . ($seen_maint_mode ? "\@MAINT\@" : "")
+                         . "configure.in"
                          . ($acinclude ? ' acinclude.m4' : '')
                          . "\n\t"
                          . 'cd $(srcdir) && aclocal'
@@ -3171,7 +3173,7 @@ sub file_contents_with_transform
 
     while (<FC_FILE>)
     {
-       $_ =~ s/\@UNMAINT\@//g
+       $_ =~ s/\@(UN)?MAINT\@//g
            unless $seen_maint_mode;
 
        eval $command;

diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am
index 3fcfb84..f7fad83 100644 (file)
--- a/lib/am/remake-hdr.am
+++ b/lib/am/remake-hdr.am
@@ -15,7 +15,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
-$(CONFIG_HEADER): @MAINT@stamp-h
+$(CONFIG_HEADER): stamp-h
 stamp-h: $(CONFIG_HEADER_IN) config.status
        CONFIG_FILES= CONFIG_HEADERS=$(CONFIG_HEADER) ./config.status
        @echo timestamp > stamp-h

diff --git a/remake-hdr.am b/remake-hdr.am
index 3fcfb84..f7fad83 100644 (file)
--- a/remake-hdr.am
+++ b/remake-hdr.am
@@ -15,7 +15,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
-$(CONFIG_HEADER): @MAINT@stamp-h
+$(CONFIG_HEADER): stamp-h
 stamp-h: $(CONFIG_HEADER_IN) config.status
        CONFIG_FILES= CONFIG_HEADERS=$(CONFIG_HEADER) ./config.status
        @echo timestamp > stamp-h