* BUGS (Minor Problems): Warn about makefile limitations.

* Makefile.am: Find and update `INSTALL' in $(srcdir).
* man/Makefile.am: Find and update manual pages in $(srcdir).

diff --git a/BUGS b/BUGS
index c227e207aec38223c213a487d2f570b945a7360c..eeb5c534e10865227020ff4221f855076e8a47ab 100644 (file)
--- a/BUGS
+++ b/BUGS
@@ -33,3 +33,11 @@ and use with caution an Autoconf with ``Important bugs''.
                     `--------------------------*/
 
 * No known serious or important bugs.
+
+* Minor Problems
+
+Some Makefile segments do not behave correctly in VPATH builds with proprietary
+`make' programs.  Some BSD `make's will work.  For best results, build in the
+source directory or use GNU `make'.
+
+Parallel builds via `make -jN' do not work.

diff --git a/ChangeLog b/ChangeLog
index 684f1632672391d3240d72a0286c8e39fff1da35..cc13304adc2e45be9d3c2d28b66998fead8036f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-27  Noah Misch  <noah@cs.caltech.edu>
+
+       * BUGS (Minor Problems): Warn about makefile limitations.
+       * Makefile.am: Find and update `INSTALL' in $(srcdir).
+       * man/Makefile.am: Find and update manual pages in $(srcdir).
+
 2004-12-24  Eric Blake  <ebb9@byu.net>
        and  Paul Eggert  <eggert@cs.ucla.edu>
 

diff --git a/Makefile.am b/Makefile.am
index 8e4081b6e1c0cad9a16edd01b05e132fa81991fb..dec5bf32aff8c6605172e56d51f0b2267df54146 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,7 @@ EXTRA_DIST = ChangeLog.0 ChangeLog.1 ChangeLog.2 \
             BUGS \
             GNUmakefile Makefile.maint Makefile.cfg
 
-MAINTAINERCLEANFILES = INSTALL
+MAINTAINERCLEANFILES = $(srcdir)/INSTALL
 
 ## -------------------- ##
 ## Forwarding targets.  ##
@@ -46,10 +46,10 @@ html:
 ## INSTALL.  ##
 ## --------- ##
 
-pkgdata_DATA = INSTALL
+pkgdata_DATA = $(srcdir)/INSTALL
 AM_MAKEINFOFLAGS = --no-headers --no-validate --no-split
-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 ##

diff --git a/man/Makefile.am b/man/Makefile.am
index 8f1f638f8ffe79870fcd48ea6ee520e36a60b697..e2c6245d1f59dbe6298dc68c43b5639ee847db70 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -18,29 +18,34 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
-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.
 common_dep = $(top_srcdir)/configure.ac $(srcdir)/common.x
 binsrcdir = $(top_srcdir)/bin
-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
 
 SUFFIXES = .x .1
 
@@ -49,6 +54,6 @@ SUFFIXES = .x .1
        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)/,,'`