Re: Trunk: Build error on FreeBSD

[Paul Eggert]

>> "bootstrap-clean" removes Makefile,
> It doesn't.

Right you are.  Sorry about that.

>> I don't see why the "touch configure" is needed.
> 
> Probably, because no configure was generated (as Andreas remarked).

Andreas was fairly cryptic, but what I *think* he was saying
was the Makefile should use $(srcdir)/configure, not ./configure,
since ./configure does not exist when we're doing an out-of-tree build.
If I understood him correctly, there should be no need to touch
$(srcdir)/configure.  If I'm wrong I hope somebody corrects me.

Thanks again for following up.  I installed the following
as trunk bzr 110134.

=== modified file 'ChangeLog'
--- ChangeLog   2012-09-22 09:46:20 +0000
+++ ChangeLog   2012-09-22 10:59:13 +0000
@@ -1,5 +1,9 @@
 2012-09-22  Paul Eggert  <address@hidden>
 
+       * Makefile.in (bootstrap): Simplify build procedure.
+       Suggested by Wolfgang Jenker in
+       <http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00456.html>.
+
        Merge from gnulib, incorporating:
        2012-09-22 sockets, sys_stat: remove AC_C_INLINE in MSVC-only cases
 

=== modified file 'Makefile.in'
--- Makefile.in 2012-09-17 22:43:12 +0000
+++ Makefile.in 2012-09-22 10:59:13 +0000
@@ -889,18 +889,13 @@
 .PHONY: bootstrap
 
 # Bootstrapping does the following:
-#  * Remove files to start from a clean slate.
+#  * Remove files to start from a bootstrap-clean slate.
 #  * Run autogen.sh, falling back on copy_autogen if autogen.sh fails.
-#  * Build Makefile, to build the build procedure itself.
+#  * Rebuild Makefile, to update the build procedure itself.
 #  * Do the actual build.
 bootstrap: bootstrap-clean FRC
        cd $(srcdir) && { ./autogen.sh || autogen/copy_autogen; }
-       if [ -x config.status ]; then \
-           ./config.status --recheck && \
-           ./config.status; \
-       else \
-           $(srcdir)/configure $(CONFIGURE_FLAGS); \
-       fi
+       $(MAKE) $(MFLAGS) Makefile
        $(MAKE) $(MFLAGS) info all
 
 .PHONY: check-declare