merge from trunk

[gnu-emacs] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index 76a4e0c570344df2222c69987d26ec92e9b34baa..aa51108ffc2356e5bb4a26c96c4672218d245233 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -23,7 +23,7 @@
 # script may need modifying in sync with changes made here.  Try to
 # avoid shell-ism because the DOS build has to use the DOS shell.
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 # Here are the things that we expect ../configure to edit.
 # We use $(srcdir) explicitly in dependencies so as not to depend on VPATH.
@@ -548,14 +548,9 @@ stamp-oldxmenu: $(OLDXMENU_DEPS)
 
 $(OLDXMENU): $(OLDXMENU_TARGET)
 
-../config.status:: epaths.in
-       @echo "The file epaths.h needs to be set up from epaths.in."
-       @echo "Please run the `configure' script again."
-       exit 1
-
-../config.status:: config.in
-       @echo "The file config.h needs to be set up from config.in."
-       @echo "Please run the `configure' script again."
+../config.status: config.in epaths.in
+       @echo "The file ${?:.in=.h} needs to be set up from $?."
+       @echo "Please run the 'configure' script again."
        exit 1
 
 doc.o: buildobj.h
@@ -668,6 +663,9 @@ $(lisp): $(BOOTSTRAPEMACS)
 
 ## VCSWITNESS points to the file that holds info about the current checkout.
 ## We use it as a heuristic to decide when to rebuild loaddefs.el.
+## If empty it is ignored; the parent makefile can set it to some other value.
+VCSWITNESS =
+
 $(lispsource)/loaddefs.el: $(BOOTSTRAPEMACS) $(VCSWITNESS)
        cd ../lisp; $(MAKE) $(MFLAGS) autoloads EMACS=$(bootstrap_exe)