Merge from trunk.

[bpt/emacs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 800f116..571013e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -355,22 +355,24 @@ blessmail: Makefile src FRC
 # config.status overrides MAKEFILE_NAME with a bogus name when creating
 # src/epaths.h, so that 'make epaths-force' does not recursively invoke
 # config.status and overwrite config.status while executing it (Bug#11214).
+#
+# 'make bootstrap' overrides MAKEFILE_NAME to a nonexistent file but
+# then attempts to build that file.  This forces 'Makefile', 'lib/Makefile',
+# etc. to be built without running into similar recursion problems.
 MAKEFILE_NAME = Makefile
 $(MAKEFILE_NAME): config.status $(srcdir)/src/config.in \
           $(srcdir)/Makefile.in $(SUBDIR_MAKEFILES_IN)
-       ./config.status
+       MAKE='$(MAKE)' ./config.status
 
 # Don't erase these files if make is interrupted while refreshing them.
 .PRECIOUS: Makefile config.status
 
-MAKE_CONFIG_STATUS = \
+config.status: ${srcdir}/configure ${srcdir}/lisp/version.el
        if [ -x ./config.status ]; then \
            ./config.status --recheck;  \
        else                            \
-           ./configure $(CONFIGURE_FLAGS); \
+           $(srcdir)/configure $(CONFIGURE_FLAGS); \
        fi
-config.status: ${srcdir}/configure ${srcdir}/lisp/version.el
-       $(MAKE_CONFIG_STATUS)
 
 AUTOCONF_INPUTS = $(srcdir)/configure.ac $(srcdir)/aclocal.m4
 
@@ -433,7 +435,7 @@ write_subdir=if [ -f $${subdir}/subdirs.el ]; \
 ### Install the executables that were compiled specifically for this machine.
 ### We do install-arch-indep first because the executable needs the
 ### Lisp files and DOC file to work properly.
-install-arch-dep: install-arch-indep install-doc
+install-arch-dep: src install-arch-indep install-doc
        umask 022; ${MKDIR_P} $(DESTDIR)${bindir}
        cd lib-src && \
          $(MAKE) install $(MFLAGS) prefix=${prefix} \
@@ -502,7 +504,7 @@ set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \
 ## work correctly, and therefore no idea when tar can be replaced.
 ## See also these comments from 2004 about cp -r working fine:
 ## http://lists.gnu.org/archive/html/autoconf-patches/2004-11/msg00005.html
-install-arch-indep: install-info install-man ${INSTALL_ARCH_INDEP_EXTRA}
+install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTRA}
        umask 022 ; \
        locallisppath='${locallisppath}'; \
        IFS=:; \
@@ -573,7 +575,7 @@ install-arch-indep: install-info install-man ${INSTALL_ARCH_INDEP_EXTRA}
 
 ## Note that install-arch-indep deletes and recreates the entire
 ## installed etc/ directory, so we need it to run before this does.
-install-doc: install-arch-indep
+install-doc: src install-arch-indep
        -unset CDPATH; \
        umask 022; ${MKDIR_P} $(DESTDIR)${docdir} ; \
        if [ `cd ./etc; /bin/pwd` != `cd $(DESTDIR)${docdir}; /bin/pwd` ]; \
@@ -737,6 +739,7 @@ clean: FRC
        -(cd doc/lispref &&   $(MAKE) $(MFLAGS) clean)
        -(cd doc/lispintro &&   $(MAKE) $(MFLAGS) clean)
        (cd leim;     $(MAKE) $(MFLAGS) clean)
+       (cd nextstep && $(MAKE) $(MFLAGS) clean)
 
 ### `bootclean'
 ###      Delete all files that need to be remade for a clean bootstrap.
@@ -763,6 +766,7 @@ distclean: FRC
        (cd doc/lispintro &&    $(MAKE) $(MFLAGS) distclean)
        (cd leim;     $(MAKE) $(MFLAGS) distclean)
        (cd lisp;     $(MAKE) $(MFLAGS) distclean)
+       (cd nextstep && $(MAKE) $(MFLAGS) distclean)
        ${top_distclean}
 
 ### `bootstrap-clean'
@@ -780,6 +784,7 @@ bootstrap-clean: FRC
        -(cd doc/lispintro &&   $(MAKE) $(MFLAGS) maintainer-clean)
        (cd leim;     $(MAKE) $(MFLAGS) maintainer-clean)
        (cd lisp;     $(MAKE) $(MFLAGS) bootstrap-clean)
+       (cd nextstep && $(MAKE) $(MFLAGS) maintainer-clean)
        [ ! -f config.log ] || mv -f config.log config.log~
        ${top_bootclean}
 
@@ -888,13 +893,13 @@ dvi:
 .PHONY: bootstrap
 
 # Bootstrapping does the following:
-#  * Remove files to start from a clean slate.
-#  * Run autogen.sh, but don't worry about exit status 101 (missing tools).
-#  * Build Makefile, to build the build procedure itself.
+#  * Remove files to start from a bootstrap-clean slate.
+#  * Run autogen.sh, falling back on copy_autogen if autogen.sh fails.
+#  * Rebuild Makefile, to update the build procedure itself.
 #  * Do the actual build.
 bootstrap: bootstrap-clean FRC
-       cd $(srcdir) && { ./autogen.sh || test $$? -eq 101; }
-       $(MAKE_CONFIG_STATUS)
+       cd $(srcdir) && { ./autogen.sh || autogen/copy_autogen; }
+       $(MAKE) $(MFLAGS) MAKEFILE_NAME=force-Makefile force-Makefile
        $(MAKE) $(MFLAGS) info all
 
 .PHONY: check-declare