diff options
| -rw-r--r-- | msdos/ChangeLog | 9 | ||||
| -rw-r--r-- | msdos/sed1v2.inp | 4 | ||||
| -rw-r--r-- | msdos/sed3v2.inp | 9 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/Makefile.in | 2 |
5 files changed, 20 insertions, 8 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 096a925edbc..7395bfe4743 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,12 @@ +2010-05-15 Eli Zaretskii <eliz@gnu.org> + + * sed3v2.inp (INSTALLABLES): Edit out extra ${EXEEXT} after + "emacsclient". + (emacsserver, timer, wakeup): Remove edit-out commands. + + * sed1v2.inp (MSDOS_OBJ): Add w16select.o. + (TERMCAP_OBJ): Add termcap.o. + 2010-05-15 Glenn Morris <rgm@gnu.org> * sed1v2.inp (OLDXMENU_TARGET): Edit to empty. diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index f4774a1017b..22e9f843a16 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -77,7 +77,7 @@ s/\.h\.in/.h-in/ /^GCONF_LIBS *=/s/@GCONF_LIBS@// /^GTK_OBJ *=/s/@GTK_OBJ@// /^LIBS_TERMCAP *=/s/@LIBS_TERMCAP@// -/^TERMCAP_OBJ *=/s/@TERMCAP_OBJ@/tparam.o/ +/^TERMCAP_OBJ *=/s/@TERMCAP_OBJ@/termcap.o tparam.o/ /^LIBXMU *=/s/@LIBXMU@// /^LIBXSM *=/s/@LIBXSM@// /^LIBXTR6 *=/s/@LIBXTR6@// @@ -91,7 +91,7 @@ s/\.h\.in/.h-in/ /^RSVG_CFLAGS *=/s/@RSVG_CFLAGS@// /^WIDGET_OBJ *=/s/@WIDGET_OBJ@// /^CYGWIN_OBJ *=/s/@CYGWIN_OBJ@// -/^MSDOS_OBJ *=/s/= */= dosfns.o msdos.o/ +/^MSDOS_OBJ *=/s/= */= dosfns.o msdos.o w16select.o/ /^MSDOS_SUPPORT *=/s/= */= $(MSDOS_SUPPORT_REAL)/ /^ns_appdir *=/s/@ns_appdir@// /^ns_appbindir *=/s/@ns_appbindir@// diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp index 323029ecf39..bc555cc0b08 100644 --- a/msdos/sed3v2.inp +++ b/msdos/sed3v2.inp @@ -44,11 +44,10 @@ /^EXEEXT *=/s!@EXEEXT@!! /^GETOPT_H *=/s!@GETOPT_H@!getopt.h! /^GETOPTOBJS *=/s!@GETOPTOBJS@!getopt.o getopt1.o! -/^INSTALLABLES/s/emacsclient *// +/^INSTALLABLES/s/emacsclient[^ ]* *// s!^ \./! ! -/^UTILITIES=/s/ wakeup// -/^UTILITIES=/s/ movemail// -/^UTILITIES=/s/ emacsserver// -/^UTILITIES=/s/ timer// +/^UTILITIES *=/,/^$/{ + s/movemail[^ ]* *// +} # arch-tag: 16f3be18-a45b-496c-b19c-e43840359de8 diff --git a/src/ChangeLog b/src/ChangeLog index fe7bd103efc..a9757cd02b4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2010-05-15 Eli Zaretskii <eliz@gnu.org> + + * Makefile.in: Fix MSDOS-related comments. + 2010-05-15 Glenn Morris <rgm@gnu.org> * Makefile.in (OLDXMENU_TARGET): New, set by configure. diff --git a/src/Makefile.in b/src/Makefile.in index ff3d632bfa5..2674d532a2c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -189,7 +189,7 @@ WIDGET_OBJ=@WIDGET_OBJ@ ## sheap.o if CYGWIN, otherwise empty. CYGWIN_OBJ=@CYGWIN_OBJ@ -## dosfns.o msdos.o if MSDOS. +## dosfns.o msdos.o w16select.o if MSDOS. MSDOS_OBJ = ## w16select.o termcap.o if MSDOS && HAVE_X_WINDOWS. MSDOS_X_OBJ = |