aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2012-12-30 07:33:03 +0200
committerEli Zaretskii2012-12-30 07:33:03 +0200
commite4f8453ad1605ce9bdb6d87ff7a1ef707a577d30 (patch)
tree0568f390016b86929c4c50fd975b44af14e82ea9
parent8db39aebe862bf2384a13b69e309115d92524853 (diff)
downloademacs-e4f8453ad1605ce9bdb6d87ff7a1ef707a577d30.tar.gz
emacs-e4f8453ad1605ce9bdb6d87ff7a1ef707a577d30.zip
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.
-rw-r--r--msdos/ChangeLog5
-rw-r--r--msdos/sed1v2.inp2
2 files changed, 6 insertions, 1 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index cbee61992db..5ec8f67979e 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,8 @@
12012-12-30 Eli Zaretskii <eliz@gnu.org>
2
3 * sed1v2.inp (TEMACS_LDFLAGS2): Remove editing.
4 (LIBS_GNUSTEP): Edit to empty.
5
12012-12-01 Eli Zaretskii <eliz@gnu.org> 62012-12-01 Eli Zaretskii <eliz@gnu.org>
2 7
3 * sed1v2.inp: Dump emacs.exe and copy to b-emacs.exe before 8 * sed1v2.inp: Dump emacs.exe and copy to b-emacs.exe before
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index 0ee7510bec1..c7199621634 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -49,7 +49,6 @@ s/\.h\.in/.h-in/
49/^LD_SWITCH_X_SITE_AUX *=/s/@LD_SWITCH_X_SITE_AUX@// 49/^LD_SWITCH_X_SITE_AUX *=/s/@LD_SWITCH_X_SITE_AUX@//
50/^LD_SWITCH_X_SITE_AUX_RPATH *=/s/@LD_SWITCH_X_SITE_AUX_RPATH@// 50/^LD_SWITCH_X_SITE_AUX_RPATH *=/s/@LD_SWITCH_X_SITE_AUX_RPATH@//
51/^LD_SWITCH_SYSTEM *=/s/@LD_SWITCH_SYSTEM@// 51/^LD_SWITCH_SYSTEM *=/s/@LD_SWITCH_SYSTEM@//
52/^TEMACS_LDFLAGS2 *=/s/@TEMACS_LDFLAGS2@/$(LDFLAGS)/
53/^LIBS_SYSTEM *=/s/@LIBS_SYSTEM@// 52/^LIBS_SYSTEM *=/s/@LIBS_SYSTEM@//
54/^LIB_GCC *=/s/@LIB_GCC@// 53/^LIB_GCC *=/s/@LIB_GCC@//
55/^LIB_STANDARD *=/s/@LIB_STANDARD@// 54/^LIB_STANDARD *=/s/@LIB_STANDARD@//
@@ -86,6 +85,7 @@ s/ *@LIBXPM@//
86/^XOBJ *=/s/@XOBJ@// 85/^XOBJ *=/s/@XOBJ@//
87/^TOOLKIT_LIBW *=/s/@TOOLKIT_LIBW@// 86/^TOOLKIT_LIBW *=/s/@TOOLKIT_LIBW@//
88/^LIBSOUND *=/s/@LIBSOUND@// 87/^LIBSOUND *=/s/@LIBSOUND@//
88/^LIBS_GNUSTEP *=/s/@LIBS_GNUSTEP@//
89/^CFLAGS_SOUND *=/s/@CFLAGS_SOUND@// 89/^CFLAGS_SOUND *=/s/@CFLAGS_SOUND@//
90/^RSVG_LIBS *=/s/@RSVG_LIBS@// 90/^RSVG_LIBS *=/s/@RSVG_LIBS@//
91/^RSVG_CFLAGS *=/s/@RSVG_CFLAGS@// 91/^RSVG_CFLAGS *=/s/@RSVG_CFLAGS@//