From: Akim Demaille <akim@epita.fr>
Date: Fri, 15 Dec 2000 08:25:09 +0000 (+0000)
Subject: * man/Makefile.am (.x.1): Fix to work properly with
X-Git-Tag: autoconf-2.50~309
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=665dbe1ab2ced248e9c7922ee249e815c90f70c1;p=thirdparty%2Fautoconf.git

* man/Makefile.am (.x.1): Fix to work properly with
builddir != srcdir.
---

diff --git a/ChangeLog b/ChangeLog
index dc1d35a28..ff4a0008f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-15  Akim Demaille  <akim@epita.fr>
+
+	* man/Makefile.am (.x.1): Fix to work properly with
+	builddir != srcdir.
+
 2000-12-15  Akim Demaille  <akim@epita.fr>
 
 	* aclang.m4 (AC_LANG(C), AC_LANG(C++), AC_LANG(Fortran 77))
diff --git a/man/Makefile.am b/man/Makefile.am
index 34894d05c..1fc2db2a4 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -24,13 +24,14 @@ config.sub.1:   $(srcdir)/config.sub.x    $(top_srcdir)/config.sub
 SUFFIXES = .x .1
 
 .x.1:
-	@if test -f $(top_builddir)/$*; then \
+	test -f $(top_builddir)/$* && prog=$(top_builddir)/$*; \
+	test -f $(top_srcdir)/$* && prog=$(top_srcdir)/$*; \
+	if test -n "$$prog"; then \
 	  echo "Updating man page $@"; \
 	  $(HELP2MAN) \
 	    --include=$(srcdir)/$*.x \
 	    --include=$(srcdir)/common.x \
-	    --output=$@ \
-	    $(top_builddir)/$*; \
+	    --output=$@ $$prog; \
 	else \
 	  echo "WARNING: The man page $@ cannot be updated yet."; \
 	  echo "         Retry once the corresponding executable is built."; \
diff --git a/man/Makefile.in b/man/Makefile.in
index 3086e6f84..1d649fdb4 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -240,13 +240,14 @@ config.guess.1: $(srcdir)/config.guess.x  $(top_srcdir)/config.guess
 config.sub.1:   $(srcdir)/config.sub.x    $(top_srcdir)/config.sub
 
 .x.1:
-	@if test -f $(top_builddir)/$*; then \
+	test -f $(top_builddir)/$* && prog=$(top_builddir)/$*; \
+	test -f $(top_srcdir)/$* && prog=$(top_srcdir)/$*; \
+	if test -n "$$prog"; then \
 	  echo "Updating man page $@"; \
 	  $(HELP2MAN) \
 	    --include=$(srcdir)/$*.x \
 	    --include=$(srcdir)/common.x \
-	    --output=$@ \
-	    $(top_builddir)/$*; \
+	    --output=$@ $$prog; \
 	else \
 	  echo "WARNING: The man page $@ cannot be updated yet."; \
 	  echo "         Retry once the corresponding executable is built."; \