procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix "config msdos" step.

Browse source 
src/Makefile.in: Fix MSDOS-related comments.
 msdos/sed3v2.inp (INSTALLABLES): Edit out extra ${EXEEXT} after "emacsclient".
 (emacsserver, timer, wakeup): Remove edit-out commands.
 msdos/sed1v2.inp (MSDOS_OBJ): Add w16select.o.
 (TERMCAP_OBJ): Add termcap.o.
This commit is contained in:
Eli Zaretskii 2010-05-15 10:19:59 +03:00
parent 1edbd30946
commit dbd3f7231a
5 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
msdos/ChangeLog
View file

@ -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.

4
msdos/sed1v2.inp
View file

@ -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@//

9
msdos/sed3v2.inp
View file

@ -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

4
src/ChangeLog
View file

@ -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.

2
src/Makefile.in
View file

@ -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 =