Mercurial > emacs
changeset 108297:e514622e9d11
Fix the "config msdos" step of MS-DOS build (due to removal of some cpp stuff from configury).
config.bat: Allow for 2 leading `#'s in comments in src/Makefile.in.
src/Makefile.in: Don't use Make-style comments past the
"start of cpp stuff" line.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Fri, 07 May 2010 14:21:29 +0300 |
| parents | 47521399f06e |
| children | ffcbc15ab440 |
| files | ChangeLog config.bat src/ChangeLog src/Makefile.in |
| diffstat | 4 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri May 07 13:45:54 2010 +0300 +++ b/ChangeLog Fri May 07 14:21:29 2010 +0300 @@ -1,3 +1,8 @@ +2010-05-07 Eli Zaretskii <eliz@gnu.org> + + * config.bat: Allow for 2 leading `#'s in comments in + src/Makefile.in. + 2010-05-07 Glenn Morris <rgm@gnu.org> * configure.in (LD_SWITCH_SYSTEM): Set with configure, not cpp.
--- a/config.bat Fri May 07 13:45:54 2010 +0300 +++ b/config.bat Fri May 07 14:21:29 2010 +0300 @@ -197,7 +197,7 @@ rem Create "makefile" from "makefile.in". rm -f Makefile junk.c -sed -e "1,/== start of cpp stuff ==/s@^# .*$@@" <Makefile.in >junk.c +sed -e "1,/== start of cpp stuff ==/s@^##*[ ].*$@@" <Makefile.in >junk.c If "%DJGPP_VER%" == "1" Goto mfV1 gcc -E -traditional junk.c | sed -f ../msdos/sed1v2.inp >Makefile goto mfDone
--- a/src/ChangeLog Fri May 07 13:45:54 2010 +0300 +++ b/src/ChangeLog Fri May 07 14:21:29 2010 +0300 @@ -1,3 +1,8 @@ +2010-05-07 Eli Zaretskii <eliz@gnu.org> + + * Makefile.in (PRE_ALLOC_OBJ): Don't use Make-style comments past + the "start of cpp stuff" line. + 2010-05-07 Glenn Morris <rgm@gnu.org> * Makefile.in (LD_SWITCH_SYSTEM): Set with configure, not cpp.
--- a/src/Makefile.in Fri May 07 13:45:54 2010 +0300 +++ b/src/Makefile.in Fri May 07 14:21:29 2010 +0300 @@ -397,9 +397,9 @@ vmlimitobj = vm-limit.o #endif /* !SYSTEM_MALLOC */ -## Empty on Cygwin, lastfile.o elsewhere. +/* Empty on Cygwin, lastfile.o elsewhere. */ PRE_ALLOC_OBJ=@PRE_ALLOC_OBJ@ -## lastfile.o vm-limit.o on Cygwin, $vmlimitobj elsewhere. +/* lastfile.o vm-limit.o on Cygwin, $vmlimitobj elsewhere. */ POST_ALLOC_OBJ=@POST_ALLOC_OBJ@ /* List of object files that make-docfile should not be told about. */