diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-05-17 17:02:06 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-05-17 17:02:06 -0400 |
| commit | 5b5262f4da935f37376c548e31e234bf2073ebef (patch) | |
| tree | ff8e99c9c247199d459abdbf3f4314db6927b78c /Makefile.in | |
| parent | 5ad4bef5758fd694d209a8fb63f42bcfdb22785c (diff) | |
| download | emacs-5b5262f4da935f37376c548e31e234bf2073ebef.tar.gz | |
* Makefile.in (${lispsource}loaddefs.el): Update loaddefs.el after a pull.
* Makefile.in (src): Provide the name of the VCS file that witnesses a pull.
($(srcdir)/src/config.in): Handle accidental removal of src/config.in.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 775c591af26..cd677d3295d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -335,9 +335,13 @@ src: Makefile FRC CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \ LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot"; \ fi; + if [ -r .bzr/checkout/dirstate ]; then \ + vcswitness="$$(pwd)/.bzr/checkout/dirstate"; \ + fi; \ cd $@; $(MAKE) all $(MFLAGS) \ CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \ - LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="" + LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="" \ + VCSWITNESS="$$vcswitness" blessmail: Makefile src FRC cd lib-src; $(MAKE) maybe-blessmail $(MFLAGS) \ @@ -369,7 +373,11 @@ $(srcdir)/configure: $(AUTOCONF_INPUTS) cd ${srcdir} && autoconf $(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in - @true + @ # Usually, there's no need to rebuild src/config.in just + @ # because stamp-h.in has changed (since building stamp-h.in + @ # refreshes config.in as well), but if config.in is missing + @ # then we really need to do something more. + [ -r "$@" ] || ( cd ${srcdir} && autoheader ) $(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS) cd ${srcdir} && autoheader rm -f $(srcdir)/src/stamp-h.in |