Bug fix

diff --git a/ChangeLog b/ChangeLog
index 05d4121daed23412e435032b18b9c94db85d2f72..72080c51359aec876539df5534404ed1c5c53f6d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Apr 26 15:10:48 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * automake.in (handle_man_pages): Fix mkinstalldirs invocation.
+
 Thu Apr 25 18:40:06 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * automake.in (handle_dist_worker): Use $(TAR), not tar.

diff --git a/TODO b/TODO
index c7e808d3bfda66aa7e52c8ee53ec9252ddf15b4c..4e4c8f2473355bb64beff7c8667a2cf8779dfffc 100644 (file)
--- a/TODO
+++ b/TODO
@@ -2,7 +2,7 @@ Priorities for release:
 * Fix all mkinstalldirs invocations
 * separate dist and distdir targets, so recursive uses of Automake work ok
 * make the auto-dep code crash if GNU make not in use?
-
+  (doesn't it already?)
 * Add no-remake option
 * scripts are installed in $exec_prefix/bin, not $prefix/bin
   Bug or feature?

diff --git a/automake.in b/automake.in
index ef6aed42005e3debae9d57181421b34e7d2029ef..c3c186dc438abbfd7d48306d657192dc96d27077 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -993,7 +993,7 @@ sub handle_man_pages
     {
        push (@installdirs, '$(mandir)/man' . $_);
        $output_rules .= ("\t" . $config_aux_dir
-                         . 'mkinstalldirs $(mandir)/man'
+                         . '/mkinstalldirs $(mandir)/man'
                          . $_ . "\n");
     }
     push (@phony, 'install-man');

diff --git a/tests/ChangeLog b/tests/ChangeLog
index ec956900eb8b5db5761183f837df84bbdcfeec09..cb5a809f53861b11fb4f9b5d8cdc3636201cfba1 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Fri Apr 26 15:15:01 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * instman.test: New file.
+
 Thu Apr 25 17:12:30 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * noinst.test: New file

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d705ae933b990adf9ea6b544f3bef17b18c589b5..121b905b5c120f0a05c89c09eda112b843b3d5ad 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 extra.test noinst.test
+target.test extra.test noinst.test instman.test
 
 EXTRA_DIST = defs $(TESTS)

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 5e7f1b4e07791b2fbc665bdcac43b32e3381a364..99a6d19bd1bb815b78aa198a4e49126d8c6d83f1 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 extra.test noinst.test
+target.test extra.test noinst.test instman.test
 
 EXTRA_DIST = defs $(TESTS)
 DIST_COMMON = ChangeLog Makefile.am Makefile.in
@@ -112,7 +112,7 @@ install-exec:
 
 install-data: 
 
-install: install-exec install-data
+install: install-exec install-data all
        @:
 
 uninstall: 

diff --git a/tests/instman.test b/tests/instman.test
new file mode 100755 (executable)
index 0000000..4ba14a6
--- /dev/null
+++ b/tests/instman.test
@@ -0,0 +1,17 @@
+#! /bin/sh
+
+# Test to make sure mkinstalldirs invocation correct in install-man
+# target.  Bug reported by Gordon Irlam <gordoni@cygnus.com>.
+
+. $srcdir/defs || exit 1
+
+cat > Makefile.am << 'EOF'
+man_MANS = frob.8
+EOF
+
+: > frob.8
+
+$AUTOMAKE || exit 1
+
+grep '[^/]mkinstalldirs' Makefile.in && exit 1
+exit 0