MS-DOS followup for 2012-12-04T21:17:30Z!monnier@iro.umontreal.ca.

 msdos/sed1v2.inp (TEMACS_LDFLAGS2): Remove editing.
 (LIBS_GNUSTEP): Edit to empty.

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index cbee61992db5e1f32844fdc0b71f146bfb5ae1ea..5ec8f67979e58078d146bb2b6089b5be8dec8f44 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-30  Eli Zaretskii  <eliz@gnu.org>
+
+       * sed1v2.inp (TEMACS_LDFLAGS2): Remove editing.
+       (LIBS_GNUSTEP): Edit to empty.
+
 2012-12-01  Eli Zaretskii  <eliz@gnu.org>
 
        * sed1v2.inp: Dump emacs.exe and copy to b-emacs.exe before

diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index 0ee7510bec1d9de2b0b1af68f14ba60e4cbf361a..c719962163480eeb25d04d3747008c084e8bff22 100644 (file)
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -49,7 +49,6 @@ s/\.h\.in/.h-in/
 /^LD_SWITCH_X_SITE_AUX *=/s/@LD_SWITCH_X_SITE_AUX@//
 /^LD_SWITCH_X_SITE_AUX_RPATH *=/s/@LD_SWITCH_X_SITE_AUX_RPATH@//
 /^LD_SWITCH_SYSTEM *=/s/@LD_SWITCH_SYSTEM@//
-/^TEMACS_LDFLAGS2 *=/s/@TEMACS_LDFLAGS2@/$(LDFLAGS)/
 /^LIBS_SYSTEM *=/s/@LIBS_SYSTEM@//
 /^LIB_GCC *=/s/@LIB_GCC@//
 /^LIB_STANDARD *=/s/@LIB_STANDARD@//
@@ -86,6 +85,7 @@ s/ *@LIBXPM@//
 /^XOBJ *=/s/@XOBJ@//
 /^TOOLKIT_LIBW *=/s/@TOOLKIT_LIBW@//
 /^LIBSOUND *=/s/@LIBSOUND@//
+/^LIBS_GNUSTEP *=/s/@LIBS_GNUSTEP@//
 /^CFLAGS_SOUND *=/s/@CFLAGS_SOUND@//
 /^RSVG_LIBS *=/s/@RSVG_LIBS@//
 /^RSVG_CFLAGS *=/s/@RSVG_CFLAGS@//