Regenerate.

diff --git a/Makefile.in b/Makefile.in
index 48ada73f624ab9bfe7403a20dccee34385b23153..53fe53c60af7512dfc66550f1fde4ae96e484363 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -151,8 +151,8 @@ EXTRA_DIST = ChangeLog.0 ChangeLog.1 ChangeLog.2 \
             BUGS \
             GNUmakefile Makefile.maint Makefile.cfg
 
-MAINTAINERCLEANFILES = INSTALL
-pkgdata_DATA = INSTALL
+MAINTAINERCLEANFILES = $(srcdir)/INSTALL
+pkgdata_DATA = $(srcdir)/INSTALL
 AM_MAKEINFOFLAGS = --no-headers --no-validate --no-split
 automake_cvsweb = \
    http://sources.redhat.com/cgi-bin/cvsweb.cgi/~checkout~/automake
@@ -592,8 +592,8 @@ html:
        cd doc && $(MAKE) $(AM_MAKEFLAGS) $@
 
 .PHONY: html
-INSTALL: $(top_srcdir)/doc/install.texi
-       $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -o $(srcdir)/INSTALL \
+$(srcdir)/INSTALL: $(top_srcdir)/doc/install.texi
+       $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -o $@ \
          $(top_srcdir)/doc/install.texi
 
 maintainer-check: maintainer-check-tests

diff --git a/man/Makefile.in b/man/Makefile.in
index 229015f5b2c4e2e2db995603db222a5432e15f80..582a3f2d916e06882342c47c5cf8cdfddc28b793 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -114,13 +114,18 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-dist_man_MANS = autoconf.1 autoreconf.1 autoheader.1 autoupdate.1 ifnames.1 \
-autoscan.1 autom4te.1 config.guess.1 config.sub.1
-
-man_aux = autoconf.x autoreconf.x autoheader.x autoupdate.x ifnames.x \
-autoscan.x autom4te.x config.guess.x config.sub.x
-
-EXTRA_DIST = $(man_aux) common.x
+dist_man_MANS = \
+       $(srcdir)/autoconf.1 \
+       $(srcdir)/autoheader.1 \
+       $(srcdir)/autom4te.1 \
+       $(srcdir)/autoreconf.1 \
+       $(srcdir)/autoscan.1 \
+       $(srcdir)/autoupdate.1 \
+       $(srcdir)/ifnames.1 \
+       $(srcdir)/config.guess.1 \
+       $(srcdir)/config.sub.1
+
+EXTRA_DIST = $(dist_man_MANS:.1=.x) common.x
 MAINTAINERCLEANFILES = $(dist_man_MANS)
 
 # Depend on configure.ac to get version number changes.
@@ -214,6 +219,7 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
+       $(mkdir_p) $(distdir)/$(srcdir)
        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
        list='$(DISTFILES)'; for file in $$list; do \
@@ -329,26 +335,26 @@ uninstall-man: uninstall-man1
        mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
        uninstall-am uninstall-info-am uninstall-man uninstall-man1
 
-autoconf.1:   $(common_dep) $(binsrcdir)/autoconf.as
-autoheader.1: $(common_dep) $(binsrcdir)/autoheader.in
-autom4te.1:   $(common_dep) $(binsrcdir)/autom4te.in
-autoreconf.1: $(common_dep) $(binsrcdir)/autoreconf.in
-autoscan.1:   $(common_dep) $(binsrcdir)/autoscan.in
-autoupdate.1: $(common_dep) $(binsrcdir)/autoupdate.in
-ifnames.1:    $(common_dep) $(binsrcdir)/ifnames.in
+$(srcdir)/autoconf.1:   $(common_dep) $(binsrcdir)/autoconf.as
+$(srcdir)/autoheader.1: $(common_dep) $(binsrcdir)/autoheader.in
+$(srcdir)/autom4te.1:   $(common_dep) $(binsrcdir)/autom4te.in
+$(srcdir)/autoreconf.1: $(common_dep) $(binsrcdir)/autoreconf.in
+$(srcdir)/autoscan.1:   $(common_dep) $(binsrcdir)/autoscan.in
+$(srcdir)/autoupdate.1: $(common_dep) $(binsrcdir)/autoupdate.in
+$(srcdir)/ifnames.1:    $(common_dep) $(binsrcdir)/ifnames.in
 
 # Independent from this package.
-config.guess.1: $(top_srcdir)/config/config.guess
-config.sub.1:   $(top_srcdir)/config/config.sub
+$(srcdir)/config.guess.1: $(top_srcdir)/config/config.guess
+$(srcdir)/config.sub.1:   $(top_srcdir)/config/config.sub
 
 .x.1:
        echo "Updating man page $@"
        PATH="$(top_builddir)/tests@PATH_SEPARATOR@$(top_srcdir)/config@PATH_SEPARATOR@$$PATH"; \
        export PATH; \
        $(HELP2MAN) \
-           --include=$(srcdir)/$*.x \
+           --include=$*.x \
            --include=$(srcdir)/common.x \
-           --output=$@ $*
+           --output=$@ `echo "$*" | sed 's,^$(srcdir)/,,'`
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: