* man/Makefile.am (.x.1): Fix to work properly with

builddir != srcdir.

diff --git a/ChangeLog b/ChangeLog
index dc1d35a28130ec5fb60f992e8aa09f6151fc213a..ff4a0008f87ac1824caa40eeadd77d89cf73c759 100644 (file)
--- 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 34894d05c362fa0e987258fb94ddcffc37de5a6f..1fc2db2a4ab8ce4d8eeb1bcdc9226c2521bcb923 100644 (file)
--- 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 3086e6f8430d95c34f7d11b2bee59001a8bb65cd..1d649fdb40bedcb8213ee91604897151bbf434df 100644 (file)
--- 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."; \