diff options
| author | Joakim Verona | 2012-12-31 00:04:10 +0100 |
|---|---|---|
| committer | Joakim Verona | 2012-12-31 00:04:10 +0100 |
| commit | 42a61fa6a6cbcfde79d812bbbba372d579dc1016 (patch) | |
| tree | 96f29a95b6a443d93875882b1d7a7dbbd6fcc849 /msdos | |
| parent | ea2da3d8fbf19765a9bd82292bfc73918f74048d (diff) | |
| parent | 84cc1ab62539eed7869a88003a017330d79e8cac (diff) | |
| download | emacs-42a61fa6a6cbcfde79d812bbbba372d579dc1016.tar.gz emacs-42a61fa6a6cbcfde79d812bbbba372d579dc1016.zip | |
auto upstream
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 @@ | |||
| 1 | 2012-12-30 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * sed1v2.inp (TEMACS_LDFLAGS2): Remove editing. | ||
| 4 | (LIBS_GNUSTEP): Edit to empty. | ||
| 5 | |||
| 1 | 2012-12-03 Eli Zaretskii <eliz@gnu.org> | 6 | 2012-12-03 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@// |