2005-02-01  Stepan Kasal  <address@hidden>

	* man/Makefile.am (.x.1): Go back to the simple solution, but take
	  care to echo the commands, so the user knows what's going on.

Index: man/Makefile.am
===================================================================
RCS file: /cvsroot/autoconf/autoconf/man/Makefile.am,v
retrieving revision 1.22
diff -u -r1.22 Makefile.am
--- man/Makefile.am	1 Feb 2005 00:14:04 -0000	1.22
+++ man/Makefile.am	1 Feb 2005 15:01:51 -0000
@@ -50,9 +50,11 @@
 SUFFIXES = .x .1
 
 .x.1:
-	@case $* in \
-	  config.* | */config.*) ;; \
-	  *) $(MAKE) $*-bin-prereq $*-tests-prereq;; \
+	@p=`echo '$*' | sed 's,.*/,,'`; case $$p in config.*) ;; *) \
+	  echo 'cd $(top_builddir)/bin &&' $(MAKE) $(AM_MAKEFLAGS) $$p && \
+	  ( cd $(top_builddir)/bin && $(MAKE) $(AM_MAKEFLAGS) $$p ) && \
+	  echo 'cd $(top_builddir)/tests &&' $(MAKE) $(AM_MAKEFLAGS) $$p && \
+	  cd $(top_builddir)/tests && $(MAKE) $(AM_MAKEFLAGS) $$p ;; \
 	esac
 	echo "Updating man page $@"
 	PATH="$(top_builddir)/address@hidden@$(top_srcdir)/address@hidden@$$PATH"; \
@@ -60,19 +62,4 @@
 	$(HELP2MAN) \
 	    --include=$*.x \
 	    --include=$(srcdir)/common.x \
-	    --output=$@ `echo "$*" | sed 's,^$(srcdir)/,,'`
-
-
-# While building man page prerequisites, avoid explicit dependencies
-# on any file that is not distributed, so that installers do not
-# unnecessarily attempt to run $(HELP2MAN), a tool that they may not
-# have.
-
-$(dist_man_MANS:.1=-bin-prereq) $(dist_man_MANS:.1=-tests-prereq):
-	@$(MAKE) $(AM_MAKEFLAGS) \
-	  builddir=$(top_builddir)/`expr 'X$@' : '.*-\([^-]*\)-prereq$$'` \
-	  program=`expr '/$@' : '.*/\([^-]*\)'` \
-	  implicit-man-prerequisites
-
-implicit-man-prerequisites:
-	cd $(builddir) && $(MAKE) $(AM_MAKEFLAGS) $(program)
+	    --output=$@ `echo '$*' | sed 's,.*/,,'`