From: Eli Zaretskii Date: Wed, 22 Sep 2010 09:45:26 +0000 (+0200) Subject: Fix the MSDOS build (broken by 2010-09-20T22:35:37Z!dann@ics.uci.edu). X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~47^2~42^2~104 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9f5a812acbffbed73e6c0c4fe040901a0dd54754;p=emacs.git Fix the MSDOS build (broken by 2010-09-20T22:35:37Z!dann@ics.uci.edu). sed1v2.inp (LINKER): Don't edit, variable was removed from src/Makefile.in. (LD_FIRSTFLAG): Edit to empty. --- diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 121dbf35542..49d49fb2487 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,9 @@ +2010-09-22 Eli Zaretskii + + * sed1v2.inp (LINKER): Don't edit, variable was removed from + src/Makefile.in. + (LD_FIRSTFLAG): Edit to empty. + 2010-09-17 Eli Zaretskii * sed1v2.inp (LIBXML2_LIBS, LIBXML2_CFLAGS): Edit to empty. diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index 9ccbb67705d..58201c155bf 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -31,6 +31,7 @@ s/\.h\.in/.h-in/ /^ALL_CFLAGS *=/s/@[^@\n]*@//g /^CPPFLAGS *=/s/@[^@\n]*@// /^LDFLAGS *=/s/@[^@\n]*@// +/^LD_FIRSTFLAG *=/s/@[^@\n]*@// /^LIBS *=/s/@[^@\n]*@// /^LIBES *=/,/^ *$/ { s/@[^@\n]*@//g @@ -51,7 +52,6 @@ s/\.h\.in/.h-in/ /^TEMACS_LDFLAGS2 *=/s/@TEMACS_LDFLAGS2@/$(LDFLAGS)/ /^LIBS_SYSTEM *=/s/@LIBS_SYSTEM@// /^LIB_GCC *=/s/@LIB_GCC@// -/^LD *=/s/@LINKER@/$(CC)/ /^LIB_STANDARD *=/s/@LIB_STANDARD@// /^LIB_MATH *=/s/@LIB_MATH@/-lm/ /^LIBTIFF *=/s/@LIBTIFF@//