[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r110080: * Makefile.in: Fix build err
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r110080: * Makefile.in: Fix build error on FreeBSD. |
Date: |
Mon, 17 Sep 2012 14:33:14 -0700 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110080
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2012-09-17 14:33:14 -0700
message:
* 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.
modified:
ChangeLog
Makefile.in
=== modified file 'ChangeLog'
--- a/ChangeLog 2012-09-17 01:02:11 +0000
+++ b/ChangeLog 2012-09-17 21:33:14 +0000
@@ -1,5 +1,14 @@
2012-09-17 Paul Eggert <address@hidden>
+ * 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.
=== modified file 'Makefile.in'
--- a/Makefile.in 2012-09-16 18:49:00 +0000
+++ b/Makefile.in 2012-09-17 21:33:14 +0000
@@ -358,19 +358,17 @@
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 @@
# * 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r110080: * Makefile.in: Fix build error on FreeBSD.,
Paul Eggert <=