diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-12-30 10:09:01 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-12-30 10:09:01 -0800 |
| commit | d5e5e7b41166815a843148f2081d19bc14b628b2 (patch) | |
| tree | 6afd575b3a741ce26e5ec1e2665d45dfab8cbb52 /msdos | |
| parent | 4f752957f174b5ab95ef6b9428669b1b1ecf0bab (diff) | |
| parent | 5c560880659048888420389c02e20d6867ec81df (diff) | |
| download | emacs-d5e5e7b41166815a843148f2081d19bc14b628b2.tar.gz | |
Merge from emacs-24; up to 2012-12-05T00:13:56Z!yamaoka@jpl.org
Diffstat (limited to 'msdos')
| -rw-r--r-- | msdos/ChangeLog | 5 | ||||
| -rw-r--r-- | msdos/sed1v2.inp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 1fdd9316847..c530dff150c 100644 --- 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-03 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 0ee7510bec1..c7199621634 100644 --- 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@// |