diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2010-05-07 14:21:29 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2010-05-07 14:21:29 +0300 |
| commit | f724825e893b6649cb8ade08101205fe0faa363a (patch) | |
| tree | 50c5dc059b7275863cfe1dbcfc658d655be715fc /src | |
| parent | 5f43e51c03f72ce8be50c475b5e0fc3cd6f94a83 (diff) | |
| download | emacs-f724825e893b6649cb8ade08101205fe0faa363a.tar.gz emacs-f724825e893b6649cb8ade08101205fe0faa363a.tar.bz2 emacs-f724825e893b6649cb8ade08101205fe0faa363a.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/Makefile.in | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 04d9d6b8266..b6847aa164e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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. diff --git a/src/Makefile.in b/src/Makefile.in index 5ea321df78c..f6fcff659a6 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -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. */ |