masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-03 10:53:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Makefile.in (bootstrap): Revert last change. Run config.status

Browse source 
after config.status --recheck, run configure from $(srcdir).
(config.status): Run configure from $(srcdir).
This commit is contained in:
Andreas Schwab 2012-09-18 00:43:12 +02:00
parent dee26dfa11
commit d3612ac370
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2012-09-17 Andreas Schwab <schwab@linux-m68k.org>
* Makefile.in (bootstrap): Revert last change. Run config.status
after config.status --recheck, run configure from $(srcdir).
(config.status): Run configure from $(srcdir).
2012-09-17 Paul Eggert <eggert@cs.ucla.edu>
* Makefile.in: Fix build error on FreeBSD.

9
Makefile.in
View file

@ -367,7 +367,7 @@ 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
AUTOCONF_INPUTS = $(srcdir)/configure.ac $(srcdir)/aclocal.m4
@ -895,7 +895,12 @@ dvi:
# * Do the actual build.
bootstrap: bootstrap-clean FRC
cd $(srcdir) && { ./autogen.sh || autogen/copy_autogen; }
./configure $(CONFIGURE_FLAGS)
if [ -x config.status ]; then \
./config.status --recheck && \
./config.status; \
else \
$(srcdir)/configure $(CONFIGURE_FLAGS); \
fi
$(MAKE) $(MFLAGS) info all
.PHONY: check-declare