diff options
| author | Glenn Morris | 2013-11-05 00:03:58 -0800 |
|---|---|---|
| committer | Glenn Morris | 2013-11-05 00:03:58 -0800 |
| commit | 21c84598d942acaf99fee5985dd3d4b771322e7b (patch) | |
| tree | 2e6a1673f4ce3c647503e6c25fb5bd40c374f4bf | |
| parent | 4dde498bceb259c0ce670a846224da39a118459b (diff) | |
| download | emacs-21c84598d942acaf99fee5985dd3d4b771322e7b.tar.gz emacs-21c84598d942acaf99fee5985dd3d4b771322e7b.zip | |
* msdos/mainmake.v2: Add missing ChangeLog entry for previous, and fix
| -rw-r--r-- | msdos/ChangeLog | 1 | ||||
| -rw-r--r-- | msdos/mainmake.v2 | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 77aa53ec274..96a5e79b13a 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | * autogen/config.in: | 3 | * autogen/config.in: |
| 4 | * autogen/Makefile.in: Move here from ../autogen. | 4 | * autogen/Makefile.in: Move here from ../autogen. |
| 5 | * mainmake.v2: Use msdos/autogen rather than autogen. | ||
| 5 | 6 | ||
| 6 | 2013-05-15 Stefan Monnier <monnier@iro.umontreal.ca> | 7 | 2013-05-15 Stefan Monnier <monnier@iro.umontreal.ca> |
| 7 | 8 | ||
diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2 index c0686deeb89..81e85a07165 100644 --- a/msdos/mainmake.v2 +++ b/msdos/mainmake.v2 | |||
| @@ -64,13 +64,13 @@ MAKESHELL=/xyzzy/command | |||
| 64 | top_srcdir := $(subst \,/,$(shell cd)) | 64 | top_srcdir := $(subst \,/,$(shell cd)) |
| 65 | 65 | ||
| 66 | # Q: Do we need to bootstrap? | 66 | # Q: Do we need to bootstrap? |
| 67 | # A: Only if we find msdos/autogen/README, i.e. we are building out of | 67 | # A: Only if we find msdos/autogen/Makefile.in, i.e. we are building out of |
| 68 | # a VCS-checkout (not a release), and src/b-emacs.exe does not exist. | 68 | # a VCS-checkout (not a release), and src/b-emacs.exe does not exist. |
| 69 | # This avoids building a bootstrap-emacs and recompiling Lisp files | 69 | # This avoids building a bootstrap-emacs and recompiling Lisp files |
| 70 | # when building a pretest/release tarball. Recompiling Lisp files | 70 | # when building a pretest/release tarball. Recompiling Lisp files |
| 71 | # is BAD because lisp/Makefile.in requires a Unixy shell. | 71 | # is BAD because lisp/Makefile.in requires a Unixy shell. |
| 72 | boot := | 72 | boot := |
| 73 | ifneq ($(wildcard msdos/autogen/README),) | 73 | ifneq ($(wildcard msdos/autogen/Makefile.in),) |
| 74 | ifeq ($(wildcard src/b-emacs.exe),) | 74 | ifeq ($(wildcard src/b-emacs.exe),) |
| 75 | boot := b-emacs.exe | 75 | boot := b-emacs.exe |
| 76 | endif | 76 | endif |