Added test

diff --git a/ChangeLog b/ChangeLog
index 0ba1a151c1ff787c5685d650f5c83f75b11801aa..c91e02d8e43f449357f5b61bc094a3f868c4c882 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Apr 23 17:57:13 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+       * doc/mdate-sh: Extract the last field from the date output, not
+       the sixth, which will fail when the timezone name has more than
+       one word or is missing.
+
 Wed Apr 24 20:29:26 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * automake.in (am_install_var): Use delete, not undef, to remove

diff --git a/THANKS b/THANKS
index 952b5cd890ab4d910f7c6c21525e54b92c90a080..a59ebb58cffbb03c6e367c8c58c8bf914ccc8ff8 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -2,6 +2,7 @@ Automake was originally written by David J. MacKenzie <djm@uunet.uu.net>.
 It would not be what it is today without the invaluable help of these
 people:
 
+Andreas Schwab <schwab@lamothe.informatik.uni-dortmund.de>
 Dieter Baron <dillo@stieltjes.smc.univie.ac.at>
 François Pinard <pinard@iro.umontreal.ca>
 Gord Matzigkeit <gord@enci.ucalgary.ca>

diff --git a/lib/mdate-sh b/lib/mdate-sh
index 60293a1f08d40467df77a86af0f4d2b29dbbfd74..0845b8bc8936fd02cf1ba8b4637d7a33ef66dec2 100755 (executable)
--- a/lib/mdate-sh
+++ b/lib/mdate-sh
@@ -63,7 +63,7 @@ day=$2
 # Here we have to deal with the problem that the ls output gives either
 # the time of day or the year.
 case $3 in
-  *:*) set `date`; year=$6
+  *:*) set `date`; eval year=\$$#
        case $2 in
         Jan) nummonthtod=1;;
         Feb) nummonthtod=2;;

diff --git a/mdate-sh b/mdate-sh
index 60293a1f08d40467df77a86af0f4d2b29dbbfd74..0845b8bc8936fd02cf1ba8b4637d7a33ef66dec2 100755 (executable)
--- a/mdate-sh
+++ b/mdate-sh
@@ -63,7 +63,7 @@ day=$2
 # Here we have to deal with the problem that the ls output gives either
 # the time of day or the year.
 case $3 in
-  *:*) set `date`; year=$6
+  *:*) set `date`; eval year=\$$#
        case $2 in
         Jan) nummonthtod=1;;
         Feb) nummonthtod=2;;

diff --git a/tests/ChangeLog b/tests/ChangeLog
index d825fadb95435e5815b89871de60dde54938792d..f468b1fef0595dc969823e8812f462ba32a18911 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Thu Apr 25 17:12:30 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * extra.test (EXTRA_PROGRAMS): New file.
+
 Tue Apr  9 22:55:07 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * target.test: New file.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 02500df12a4545a80094af97670aee831ac652a7..43caf55fad42100725f6c007c18810cd6d9d92b5 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,6 +6,6 @@ TESTS = mdate.test vtexi.test acoutput.test instexec.test checkall.test \
 acoutnoq.test acouttbs.test libobj.test proginst.test acoutqnl.test \
 confincl.test spelling.test prefix.test badprog.test depend.test exdir.test \
 canon.test installsh.test empty.test rulepat.test insh.test canon2.test \
-target.test
+target.test extra.test
 
 EXTRA_DIST = defs $(TESTS)

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 5c4ec1a4946d13c23eed6ab12ab1c263c0dbe19d..c812e0b1585e9c6e5d880649c3887b2292b23a3d 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -44,7 +44,7 @@ TESTS = mdate.test vtexi.test acoutput.test instexec.test checkall.test \
 acoutnoq.test acouttbs.test libobj.test proginst.test acoutqnl.test \
 confincl.test spelling.test prefix.test badprog.test depend.test exdir.test \
 canon.test installsh.test empty.test rulepat.test insh.test canon2.test \
-target.test
+target.test extra.test
 
 EXTRA_DIST = defs $(TESTS)
 DIST_COMMON = ChangeLog Makefile.am Makefile.in

diff --git a/tests/extra.test b/tests/extra.test
new file mode 100755 (executable)
index 0000000..014f171
--- /dev/null
+++ b/tests/extra.test
@@ -0,0 +1,15 @@
+#! /bin/sh
+
+# Test to make sure EXTRA_ targets are not generated.
+
+. $srcdir/defs || exit 1
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = @foo@
+EXTRA_PROGRAMS = zardoz
+END
+
+$AUTOMAKE || exit 1
+
+grep "^zardoz" Makefile.in && exit 1
+exit 0