From f724825e893b6649cb8ade08101205fe0faa363a Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 7 May 2010 14:21:29 +0300 Subject: 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. --- src/ChangeLog | 5 +++++ src/Makefile.in | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'src') 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 + + * Makefile.in (PRE_ALLOC_OBJ): Don't use Make-style comments past + the "start of cpp stuff" line. + 2010-05-07 Glenn Morris * 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. */ -- cgit v1.2.3