mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-21 06:55:39 +00:00
Code Issues Releases Activity

* Makefile.in: Fix build error on FreeBSD.

Browse Source 
($(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.
This commit is contained in:
Paul Eggert 2012-09-17 14:33:14 -07:00
parent c8b9f1bcbf
commit 50bfc8243c
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,5 +1,14 @@
2012-09-17 Paul Eggert <eggert@cs.ucla.edu> 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. Remove no-longer-needed Solaris 2.4 vfork bug workaround.
* configure.ac (ac_cv_func_vfork_works): Default to 'no' on * configure.ac (ac_cv_func_vfork_works): Default to 'no' on
Solaris 2.4, so that AC_FUNC_VFORK doesn't think vfork works. Solaris 2.4, so that AC_FUNC_VFORK doesn't think vfork works.

8
Makefile.in
View File

@ -358,19 +358,17 @@ blessmail: Makefile src FRC
MAKEFILE_NAME = Makefile MAKEFILE_NAME = Makefile
$(MAKEFILE_NAME): config.status $(srcdir)/src/config.in \ $(MAKEFILE_NAME): config.status $(srcdir)/src/config.in \
$(srcdir)/Makefile.in $(SUBDIR_MAKEFILES_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. # Don't erase these files if make is interrupted while refreshing them.
.PRECIOUS: Makefile config.status .PRECIOUS: Makefile config.status
MAKE_CONFIG_STATUS = \ config.status: ${srcdir}/configure ${srcdir}/lisp/version.el
if [ -x ./config.status ]; then \ if [ -x ./config.status ]; then \
./config.status --recheck; \ ./config.status --recheck; \
else \ else \
./configure $(CONFIGURE_FLAGS); \ ./configure $(CONFIGURE_FLAGS); \
fi fi
config.status: ${srcdir}/configure ${srcdir}/lisp/version.el
$(MAKE_CONFIG_STATUS)
AUTOCONF_INPUTS = $(srcdir)/configure.ac $(srcdir)/aclocal.m4 AUTOCONF_INPUTS = $(srcdir)/configure.ac $(srcdir)/aclocal.m4
@ -897,7 +895,7 @@ dvi:
# * Do the actual build. # * Do the actual build.
bootstrap: bootstrap-clean FRC bootstrap: bootstrap-clean FRC
cd $(srcdir) && { ./autogen.sh || test $$? -eq 101; } cd $(srcdir) && { ./autogen.sh || test $$? -eq 101; }
$(MAKE_CONFIG_STATUS) ./configure $(CONFIGURE_FLAGS)
$(MAKE) $(MFLAGS) info all $(MAKE) $(MFLAGS) info all
.PHONY: check-declare .PHONY: check-declare