From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 21 Sep 2008 02:25:04 +0000 (+0200)
Subject: Fix man page creation without installed files.
X-Git-Tag: v1.10b~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=389a02829a4746c0809419691c95f5e9b0e73773;p=thirdparty%2Fautomake.git

Fix man page creation without installed files.

* doc/Makefile.am (update_mans): Use wrappers in tests/
directory.
($(srcdir)/aclocal-$(APIVERSION).1): Use versioned wrapper as
input program to help2man.
($(srcdir)/automake-$(APIVERSION).1): Likewise.
Report by Eric Blake.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index 33b8f0277..c0938d7bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-09-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Fix man page creation without installed files.
+	* doc/Makefile.am (update_mans): Use wrappers in tests/
+	directory.
+	($(srcdir)/aclocal-$(APIVERSION).1): Use versioned wrapper as
+	input program to help2man.
+	($(srcdir)/automake-$(APIVERSION).1): Likewise.
+	Report by Eric Blake.
+
 2008-09-20  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	Remove unneeded per-rule *INSTALL variables.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index c6d200ffc..0a2a076fc 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -27,16 +27,17 @@ dist_man1_MANS = \
   $(srcdir)/automake-$(APIVERSION).1
 MAINTAINERCLEANFILES = $(dist_man1_MANS)
 update_mans = \
-  PATH=..$(PATH_SEPARATOR)$$PATH; export PATH; \
+  PATH="`pwd`/../tests$(PATH_SEPARATOR)$$PATH" && \
+  export PATH && \
   $(HELP2MAN) --output=$@
 $(dist_man1_MANS): $(top_srcdir)/configure.ac
 $(srcdir)/aclocal.1 $(srcdir)/automake.1:
 	f=`echo $@ | sed 's|.*/||; s|\.1$$||; $(transform)'`; \
 	echo ".so man1/$$f-$(APIVERSION).1" > $@
 $(srcdir)/aclocal-$(APIVERSION).1: $(srcdir)/../aclocal.in
-	$(update_mans) aclocal
+	$(update_mans) aclocal-$(APIVERSION)
 $(srcdir)/automake-$(APIVERSION).1: $(srcdir)/../automake.in
-	$(update_mans) automake
+	$(update_mans) automake-$(APIVERSION)
 
 # The following requires a fixed version of the Emacs 19.30 etags.
 ETAGS_ARGS = --lang=none \
diff --git a/doc/Makefile.in b/doc/Makefile.in
index d98e14d80..65f2747de 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -192,7 +192,8 @@ dist_man1_MANS = \
 
 MAINTAINERCLEANFILES = $(dist_man1_MANS)
 update_mans = \
-  PATH=..$(PATH_SEPARATOR)$$PATH; export PATH; \
+  PATH="`pwd`/../tests$(PATH_SEPARATOR)$$PATH" && \
+  export PATH && \
   $(HELP2MAN) --output=$@
 
 
@@ -749,9 +750,9 @@ $(srcdir)/aclocal.1 $(srcdir)/automake.1:
 	f=`echo $@ | sed 's|.*/||; s|\.1$$||; $(transform)'`; \
 	echo ".so man1/$$f-$(APIVERSION).1" > $@
 $(srcdir)/aclocal-$(APIVERSION).1: $(srcdir)/../aclocal.in
-	$(update_mans) aclocal
+	$(update_mans) aclocal-$(APIVERSION)
 $(srcdir)/automake-$(APIVERSION).1: $(srcdir)/../automake.in
-	$(update_mans) automake
+	$(update_mans) automake-$(APIVERSION)
 
 # We depend on configure.ac so that we regenerate the tarball
 # whenever the Automake version changes.