X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/8af8e70ee535bd2d657a034e1452f78925c9ca38..3855635591937dc2076ff143f8ad3b8b35495231:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 4dd8cff1bb..a8cdd6a901 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -331,11 +331,12 @@ DOS_gnulib_comp.m4 = gl-comp.m4
 # $(gnulib_srcdir) (relative to $(srcdir) and should have build tools
 # as per $(gnulib_srcdir)/DEPENDENCIES.
 GNULIB_MODULES = \
-  crypto/md5 dtoastr filemode getloadavg getopt-gnu \
+  careadlinkat crypto/md5 dtoastr filemode getloadavg getopt-gnu \
   ignore-value intprops lstat mktime readlink \
-  socklen stdio strftime symlink sys_stat
+  socklen stdarg stdio strftime strtoumax symlink sys_stat
 GNULIB_TOOL_FLAGS = \
- --import --no-changelog --no-vc-files --makefile-name=gnulib.mk
+ --conditional-dependencies --import --no-changelog --no-vc-files \
+ --makefile-name=gnulib.mk
 sync-from-gnulib: $(gnulib_srcdir)
 	-cd $(srcdir)/m4 && cp $(DOS_gnulib_comp.m4) gnulib-comp.m4
 	cd $(srcdir) && \
@@ -344,13 +345,9 @@ sync-from-gnulib: $(gnulib_srcdir)
 	cd $(srcdir)/m4 && mv gnulib-comp.m4 $(DOS_gnulib_comp.m4)
 	cp $(gnulib_srcdir)/build-aux/texinfo.tex $(srcdir)/doc/misc
 	cp \
-	  $(gnulib_srcdir)/build-aux/config.sub \
-	  $(gnulib_srcdir)/build-aux/config.guess \
-	  $(gnulib_srcdir)/build-aux/install-sh \
-	  $(gnulib_srcdir)/build-aux/mkinstalldirs \
 	  $(gnulib_srcdir)/build-aux/move-if-change \
 	  $(srcdir)
-	cd $(srcdir) && autoreconf -I m4
+	cd $(srcdir) && autoreconf -i -I m4
 .PHONY: sync-from-gnulib
 
 # These targets should be "${SUBDIR} without `src'".
@@ -406,8 +403,15 @@ Makefile: config.status $(srcdir)/src/config.in \
           $(srcdir)/test/automated/Makefile.in
 	./config.status
 
+# Don't erase config.status if make is interrupted while refreshing it.
+.PRECIOUS: config.status
+
 config.status: ${srcdir}/configure ${srcdir}/lisp/version.el
-	./config.status --recheck
+	if [ -x ./config.status ]; then	\
+	    ./config.status --recheck;	\
+	else				\
+	    ./configure;		\
+	fi
 
 AUTOCONF_INPUTS = @MAINT@ $(srcdir)/configure.in $(srcdir)/aclocal.m4
 
@@ -678,7 +682,7 @@ install-strip:
 
 ### Build all the directories we're going to install Emacs in.	Since
 ### we may be creating several layers of directories (for example,
-### /usr/local/lib/emacs/19.0/mips-dec-ultrix4.2), we use mkinstalldirs
+### /usr/local/lib/emacs/19.0/mips-dec-ultrix4.2), we use install-sh -d
 ### instead of mkdir.  Not all systems' mkdir programs have the `-p' flag.
 ### We set the umask so that any created directories are world-readable.
 ### FIXME it would be good to warn about non-standard permissions of
@@ -692,7 +696,7 @@ mkdir: FRC
 	done ; \
 	icondirs=`echo "$${icondirs}" | sed 's,$(srcdir)/etc/images/icons,$(DESTDIR)${icondir},g'` ; \
 	umask 022 ; \
-	$(srcdir)/mkinstalldirs $(DESTDIR)${datadir} ${COPYDESTS} \
+	$(srcdir)/install-sh -d $(DESTDIR)${datadir} ${COPYDESTS} \
 	  $(DESTDIR)${infodir} $(DESTDIR)${man1dir} \
 	  $(DESTDIR)${bindir} $(DESTDIR)${docdir} $(DESTDIR)${libexecdir} \
 	  $(DESTDIR)${datadir}/emacs/site-lisp \
@@ -795,7 +799,7 @@ top_bootclean=\
 ###      distribution.
 top_distclean=\
 	${top_bootclean}; \
-	rm -f config.status Makefile stamp-h1 ${SUBDIR_MAKEFILES}
+	rm -f config.status config.log~ Makefile stamp-h1 ${SUBDIR_MAKEFILES}
 distclean: FRC
 	(cd src;      $(MAKE) $(MFLAGS) distclean)
 	(cd oldXMenu; $(MAKE) $(MFLAGS) distclean)
@@ -825,7 +829,10 @@ bootstrap-clean: FRC
 	-(cd doc/lispintro &&   $(MAKE) $(MFLAGS) maintainer-clean)
 	(cd leim;     $(MAKE) $(MFLAGS) maintainer-clean)
 	(cd lisp;     $(MAKE) $(MFLAGS) bootstrap-clean)
+	[ ! -e config.log ] || mv -f config.log config.log~
 	${top_bootclean}
+## configure; make bootstrap replaces the real config.log from configure
+## with the truncated one from config.status.  The former is more useful.
 
 ### `maintainer-clean'
 ###      Delete everything from the current directory that can be
@@ -924,6 +931,8 @@ dvi:
 
 .PHONY: bootstrap
 
+## configure; make bootstrap replaces the real config.log from configure
+## with the truncated one from config.status.  The former is more useful.
 bootstrap: bootstrap-clean FRC
 	if [ -x ./config.status ]; then           \
 	    ./config.status;                      \