* Makefile.in: Fix build error on FreeBSD.

($(MAKEFILE_NAME)): Pass MAKE='$(MAKE)' to config.status's env.
Suggested by Wolfgang Jenker in
<http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00430.html>.
(MAKE_CONFIG_STATUS): Remove.  Remaining use expanded.
This undoes part of the 2012-09-10 patch.
(bootstrap): Run ./configure, rather than trying to run config.status
if it exists.  That builds src/epaths.h more reliably.

2 files changed, 12 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 7b9da902551..48d1e52e2cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2012-09-17  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * Makefile.in: Fix build error on FreeBSD.
+        ($(MAKEFILE_NAME)): Pass MAKE='$(MAKE)' to config.status's env.
+        Suggested by Wolfgang Jenker in
+        <http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00430.html>.
+        (MAKE_CONFIG_STATUS): Remove.  Remaining use expanded.
+        This undoes part of the 2012-09-10 patch.
+        (bootstrap): Run ./configure, rather than trying to run config.status
+        if it exists.  That builds src/epaths.h more reliably.
+
         Remove no-longer-needed Solaris 2.4 vfork bug workaround.
         * configure.ac (ac_cv_func_vfork_works): Default to 'no' on
         Solaris 2.4, so that AC_FUNC_VFORK doesn't think vfork works.
diff --git a/Makefile.in b/Makefile.in
index 9bb85967930..386c4c135be 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -358,19 +358,17 @@ blessmail: Makefile src FRC
 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); \
         fi
-config.status: ${srcdir}/configure ${srcdir}/lisp/version.el
-        $(MAKE_CONFIG_STATUS)
 
 AUTOCONF_INPUTS = $(srcdir)/configure.ac $(srcdir)/aclocal.m4
 
@@ -897,7 +895,7 @@ dvi:
 #  * Do the actual build.
 bootstrap: bootstrap-clean FRC
         cd $(srcdir) && { ./autogen.sh || test $$? -eq 101; }
-        $(MAKE_CONFIG_STATUS)
+        ./configure $(CONFIGURE_FLAGS)
         $(MAKE) $(MFLAGS) info all
 
 .PHONY: check-declare