From: Tom Tromey <tromey@redhat.com>
Date: Fri, 26 Apr 1996 21:18:57 +0000 (+0000)
Subject: Bug fix
X-Git-Tag: Release-0-32~2
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=d374dd828948d8bf204c81dd4919fd6e90288cfa;p=automake.git

Bug fix
---

diff --git a/ChangeLog b/ChangeLog
index 05d4121d..72080c51 100644
--- 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 c7e808d3..4e4c8f24 100644
--- 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 ef6aed42..c3c186dc 100755
--- 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 ec956900..cb5a809f 100644
--- 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 d705ae93..121b905b 100644
--- 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 5e7f1b4e..99a6d19b 100644
--- 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
index 00000000..4ba14a6b
--- /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