Make sure ansi2knr is distributed

diff --git a/ChangeLog b/ChangeLog
index 431b00b..1fe2aa0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Jul 19 10:12:27 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * automake.in (initialize_global_constants): Put ansi2knr.c and
+       ansi2knr.1 into common_files.  Bug report from François Pinard.
+
+Mon Jul 15 10:28:29 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * install-sh: Updated copyright notice.
+
 Fri Jul  5 08:23:00 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * subdirs.am (maintainer-clean-recursive): Don't be so noisy.

diff --git a/automake.in b/automake.in
index 2026709..6fa7e8d 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2605,15 +2605,14 @@ sub initialize_global_constants
         "INSTALL", "ABOUT-NLS", "ChangeLog", "configure", "configure.in",
         "config.guess", "config.sub", "AUTHORS", "BACKLOG", "ABOUT-GNU",
         "libversion.in", "mdate-sh", "mkinstalldirs", "install-sh",
-        'texinfo.tex'
+        'texinfo.tex', "ansi2knr.c", "ansi2knr.1"
         );
 
     # Commonly used files we auto-include, but only sometimes.
     @common_sometimes =
        (
         "aclocal.m4", "acconfig.h", "config.h.top",
-        "config.h.bot", "stamp-h.in", "ansi2knr.c",
-        "ansi2knr.1", 'stamp-vti', 'elisp-comp', 'libtool'
+        "config.h.bot", "stamp-h.in", 'stamp-vti', 'elisp-comp', 'libtool'
         );
 
     $USAGE = "\

diff --git a/install-sh b/install-sh
index 5871924..178cdac 100755 (executable)
--- a/install-sh
+++ b/install-sh
@@ -1,12 +1,24 @@
 #! /bin/sh
 #
 # install - install a program, script, or datafile
-# This comes from X11R5.
+# This comes from X11R5 (mit/util/scripts/install.sh).
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
 # `make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
+# Copyright 1991 by the Massachusetts Institute of Technology
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of M.I.T. not be used in advertising or
+# publicity pertaining to distribution of the software without specific,
+# written prior permission.  M.I.T. makes no representations about the
+# suitability of this software for any purpose.  It is provided "as is"
+# without express or implied warranty.
+#
 # This script is compatible with the BSD install script, but was written
 # from scratch.
 #

diff --git a/lib/install-sh b/lib/install-sh
index 5871924..178cdac 100755 (executable)
--- a/lib/install-sh
+++ b/lib/install-sh
@@ -1,12 +1,24 @@
 #! /bin/sh
 #
 # install - install a program, script, or datafile
-# This comes from X11R5.
+# This comes from X11R5 (mit/util/scripts/install.sh).
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
 # `make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
+# Copyright 1991 by the Massachusetts Institute of Technology
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of M.I.T. not be used in advertising or
+# publicity pertaining to distribution of the software without specific,
+# written prior permission.  M.I.T. makes no representations about the
+# suitability of this software for any purpose.  It is provided "as is"
+# without express or implied warranty.
+#
 # This script is compatible with the BSD install script, but was written
 # from scratch.
 #

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 1c061dd..08e9d05 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jul 19 10:09:56 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * ansi.test: New file.
+
 Sun Jun  9 23:20:03 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * texinfo2.test: New file.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 428215e..c424c46 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,6 +9,6 @@ canon.test installsh.test empty.test rulepat.test insh.test canon2.test \
 target.test extra.test noinst.test instman.test mkinstall.test auxdir.test \
 canon3.test mdate2.test subdir.test backsl.test package.test number.test \
 insh2.test outdir.test fpinstall.test fpinst2.test texinfo.test dejagnu.test \
-yacc.test mkinstall2.test texinfo2.test
+yacc.test mkinstall2.test texinfo2.test ansi.test
 
 EXTRA_DIST = defs $(TESTS)

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 506e2a0..64bd547 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -47,7 +47,7 @@ canon.test installsh.test empty.test rulepat.test insh.test canon2.test \
 target.test extra.test noinst.test instman.test mkinstall.test auxdir.test \
 canon3.test mdate2.test subdir.test backsl.test package.test number.test \
 insh2.test outdir.test fpinstall.test fpinst2.test texinfo.test dejagnu.test \
-yacc.test mkinstall2.test texinfo2.test
+yacc.test mkinstall2.test texinfo2.test ansi.test
 
 EXTRA_DIST = defs $(TESTS)
 mkinstalldirs = $(top_srcdir)/mkinstalldirs

diff --git a/tests/ansi.test b/tests/ansi.test
new file mode 100755 (executable)
index 0000000..89d7449
--- /dev/null
+++ b/tests/ansi.test
@@ -0,0 +1,23 @@
+#! /bin/sh
+
+# Test for bug where ansi2knr.c is not included in distribution.
+# From François Pinard.
+
+. $srcdir/defs || exit 1
+
+cat > Makefile.am << 'END'
+AUTOMAKE_OPTIONS = ansi2knr
+magic:
+       @echo $(DISTFILES)
+END
+
+cat >> configure.in << 'END'
+fp_C_PROTOTYPES
+END
+
+: > ansi2knr.c
+: > ansi2knr.1
+
+$AUTOMAKE || exit 1
+
+make -s -f Makefile.in magic | grep 'ansi2knr\.c'