Various

diff --git a/ChangeLog b/ChangeLog
index e19b0b6464f46e4e3ae3b304490c020b6f7ae755..389483e8677f5b40dc2fb5ac0fe03f7a5ab48063 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 Wed Jan  3 00:05:40 1996  Tom Tromey  <tromey@cambric.colorado.edu>
 
+       * mkinstalldirs: Reverted.
+
+       * automake.in (initialize_global_constants): Allow COPYING.LIB
+       again.
+       (check_gnits_standards): Disallow COPYING.LIB.
+
+       * texinfos.am (install-info): Only look in $(srcdir) for info
+       files.
+
        * automake.in (initialize_global_constants): New variable
        gen_copyright.
        (read_am_file): Put a copyright in each Makefile.in.

diff --git a/TODO b/TODO
index ee036f42be0fa40314d2c59d99aa298516824797..eb537e0d57efab899e99e32ea84fb4dfa852f2fb 100644 (file)
--- a/TODO
+++ b/TODO
@@ -73,6 +73,9 @@ package by GNU standards or by automake?
 Some things for --strictness=gnits:
 * "cd $(foo); something" is an error in a rule.  Should be:
   "cd $(foo) && something"
+* check for version number in NEWS file.
+If --gnits or --gnu specified, then it should be specified in the
+"dist" target as well.
 
 Maybe it should be possible to disable all GNU-specific things with
 --no-gnu? --ignore-standards?  But what?  And why?
@@ -109,6 +112,13 @@ I agree, but I don't see how to implement this yet.
 
 Should COPYING.LIB be distributed?
 
+Look at configure.in to see if NLS support is used.  Then require the
+file ABOUT-NLS.  Be sure to write this so that other configure.in
+tweaks are easy.
+
+Check all source files to make sure that FSF address is up-to-date.
+--gnits or --gnu only.
+
 ================================================================
 
 For CONFIG_HEADER,

diff --git a/automake.in b/automake.in
index aec540fa621d119c415ffa769dbd90e22e9344ae..72bafe587c76606ad2e345e8d87aa78646691e17 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1078,6 +1078,17 @@ sub check_gnu_standards
 # Do any extra checking for GNITS standards.
 sub check_gnits_standards
 {
+    if ($strictness >= $GNITS && -f $relative_dir . '/COPYING.LIB')
+    {
+       &am_error
+           ("\`${relative_dir}/COPYING.LIB' disallowed by Gnits standards");
+    }
+
+    if ($relative_dir eq '.')
+    {
+       # In top level (or only) directory.
+       &require_file ($GNITS, 'THANKS');
+    }
 }
 
 ################################################################
@@ -1308,7 +1319,7 @@ sub initialize_global_constants
     # DISTFILES.
     @common_files =
        (
-        "README", "THANKS", "TODO", "NEWS", "COPYING",
+        "README", "THANKS", "TODO", "NEWS", "COPYING", "COPYING.LIB",
         "INSTALL", "ABOUT-NLS", "ChangeLog", "configure", "configure.in",
         "config.guess", "config.sub", "AUTHORS", "BACKLOG", "ABOUT-GNU"
         );

diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 2f3c8a55e2b187e88e22fb89942bde01844ea621..b57ac19b4164a8dc8141610bc124dabdbd809301 100644 (file)
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -10,14 +10,9 @@
 install-info: $(INFO_DEPS)
        $(top_srcdir)/mkinstalldirs $(infodir)
        for file in $(INFO_DEPS); do            \
-         if test -f $$file; then               \
-           d=.;                                \
-         else                                  \
-           d=$(srcdir);                        \
-         fi;                                   \
 ## This ${...} is in the shell, not in make.
-         for ifile in `cd $$d && echo $${file}*`; do \
-           $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile; \
+         for ifile in $(srcdir)/$${file}*; do  \
+           $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile; \
          done;                                 \
 ## We need the 'else' because in some broken versions of sh 'if' will
 ## return false if the test fails.  We use ':' because the GNU

diff --git a/lib/mkinstalldirs b/lib/mkinstalldirs
index cd1fe0a7947c8ef25c705fb074e19baf1e4558f6..0801ec2c96612d4502d7ca321a3585b013b50397 100755 (executable)
--- a/lib/mkinstalldirs
+++ b/lib/mkinstalldirs
@@ -2,12 +2,12 @@
 # mkinstalldirs --- make directory hierarchy
 # Author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
+# Last modified: 1994-03-25
 # Public domain
 
 errstatus=0
 
-for file
-do
+for file in ${1+"$@"} ; do 
    set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
    shift
 

diff --git a/mkinstalldirs b/mkinstalldirs
index cd1fe0a7947c8ef25c705fb074e19baf1e4558f6..0801ec2c96612d4502d7ca321a3585b013b50397 100755 (executable)
--- a/mkinstalldirs
+++ b/mkinstalldirs
@@ -2,12 +2,12 @@
 # mkinstalldirs --- make directory hierarchy
 # Author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
+# Last modified: 1994-03-25
 # Public domain
 
 errstatus=0
 
-for file
-do
+for file in ${1+"$@"} ; do 
    set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
    shift
 

diff --git a/texinfos.am b/texinfos.am
index 2f3c8a55e2b187e88e22fb89942bde01844ea621..b57ac19b4164a8dc8141610bc124dabdbd809301 100644 (file)
--- a/texinfos.am
+++ b/texinfos.am
@@ -10,14 +10,9 @@
 install-info: $(INFO_DEPS)
        $(top_srcdir)/mkinstalldirs $(infodir)
        for file in $(INFO_DEPS); do            \
-         if test -f $$file; then               \
-           d=.;                                \
-         else                                  \
-           d=$(srcdir);                        \
-         fi;                                   \
 ## This ${...} is in the shell, not in make.
-         for ifile in `cd $$d && echo $${file}*`; do \
-           $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile; \
+         for ifile in $(srcdir)/$${file}*; do  \
+           $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile; \
          done;                                 \
 ## We need the 'else' because in some broken versions of sh 'if' will
 ## return false if the test fails.  We use ':' because the GNU