diff options
| author | Eli Zaretskii | 2014-01-12 19:27:17 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2014-01-12 19:27:17 +0200 |
| commit | cbe02c1fe96c23472dd7f0c3c21c947012daf346 (patch) | |
| tree | 0ec086b220320853fa052ef9a96a09b0d1f1adf2 /src | |
| parent | 194a9710e319aea2b748bd01b7d8189ed95636f3 (diff) | |
| download | emacs-cbe02c1fe96c23472dd7f0c3c21c947012daf346.tar.gz emacs-cbe02c1fe96c23472dd7f0c3c21c947012daf346.zip | |
Revert part of 2014-01-12T14:54:50Z!esr@thyrsus.com and fix the VCSWITNESS thingy.
Makefile.in (src): Fix the computation of $vcswitness.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index b8ec4fdf352..388923596c9 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -629,10 +629,12 @@ tags: TAGS ../lisp/TAGS $(lwlibdir)/TAGS | |||
| 629 | ## Since the .el.elc rule cannot specify an extra dependency, we do it here. | 629 | ## Since the .el.elc rule cannot specify an extra dependency, we do it here. |
| 630 | $(lisp): $(BOOTSTRAPEMACS) | 630 | $(lisp): $(BOOTSTRAPEMACS) |
| 631 | 631 | ||
| 632 | ## This ought to depend on every Lisp file that contains an autoload cookie. | 632 | ## VCSWITNESS points to the file that holds info about the current checkout. |
| 633 | ## A task for the future... | 633 | ## We use it as a heuristic to decide when to rebuild loaddefs.el. |
| 634 | ## If empty it is ignored; the parent makefile can set it to some other value. | ||
| 635 | VCSWITNESS = | ||
| 634 | 636 | ||
| 635 | $(lispsource)/loaddefs.el: $(BOOTSTRAPEMACS) | 637 | $(lispsource)/loaddefs.el: $(BOOTSTRAPEMACS) $(VCSWITNESS) |
| 636 | cd ../lisp; $(MAKE) $(MFLAGS) autoloads EMACS="$(bootstrap_exe)" | 638 | cd ../lisp; $(MAKE) $(MFLAGS) autoloads EMACS="$(bootstrap_exe)" |
| 637 | 639 | ||
| 638 | ## Dump an Emacs executable named bootstrap-emacs containing the | 640 | ## Dump an Emacs executable named bootstrap-emacs containing the |