mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-22 10:26:20 +00:00
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.
This commit is contained in:
parent
5f43e51c03
commit
f724825e89
@ -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.
|
||||
|
@ -197,7 +197,7 @@ if exist dir.h ren dir.h vmsdir.h
|
||||
|
||||
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
|
||||
|
@ -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.
|
||||
|
@ -397,9 +397,9 @@ rallocobj = ralloc.o
|
||||
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. */
|
||||
|
Loading…
Reference in New Issue
Block a user