On VCS-independent ways of identifying commits, and why they are desirable.

[bpt/emacs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 4e5cb40..852a134 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -373,13 +373,19 @@ lib lib-src lisp nt: Makefile FRC
 # file src/foo.c forces dumping a new bootstrap-emacs, then re-byte-compiling
 # all preloaded elisp files, and only then dump the actual src/emacs, which
 # is not wrong, but is overkill in 99.99% of the cases.
+#
+# Note the use of single quotes in the value of vcswitness.
+# This passes an unexpanded $srcdir to src's Makefile, which then
+# expands it using its own value of srcdir (which points to the
+# source directory of src/).
 src: Makefile FRC
        dirstate='.bzr/checkout/dirstate';                              \
-       vcswitness='$(srcdir)/../'$$dirstate;                           \
+       vcswitness='$$(srcdir)/../'$$dirstate;                          \
        [ -r "$(srcdir)/$$dirstate" ] || vcswitness='';                 \
        cd $@ || exit;                                                  \
        boot=bootstrap-emacs$(EXEEXT);                                  \
        [ ! -x "$$boot" ] || boot='';                                   \
+       echo "VCSWITNESS: $$vcswitness";\
        $(MAKE) all $(MFLAGS)                                           \
          CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}'          \
          LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot"   \