Mercurial > emacs
changeset 107548:f1433702b7ea
Fix the MSDOS build as fallout from the latest Makefile.in changes.
config.bat <lib-src>: Edit out lines that begin with several #
characters.
msdos/sedlisp.inp (VPATH): Don't edit, no longer needed.
(lisp, srcdir): Adapt to lisp/Makefile.in changes.
(abs_top_builddir): New edit.
msdos/sed3v2.inp (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(LIBHESIOD, LIBRESOLV, LIBS_MAIL): Edit to empty values.
msdos/sed3.inp (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
(LIBHESIOD, LIBRESOLV, LIBS_MAIL): Edit to empty values.
msdos/sed1v2.inp (abs_builddir): Edit into "../src".
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sat, 27 Mar 2010 13:49:18 +0300 |
| parents | 87db339a9f55 |
| children | 0be378fcb83b |
| files | ChangeLog config.bat msdos/ChangeLog msdos/sed1v2.inp msdos/sed3.inp msdos/sed3v2.inp msdos/sedlisp.inp |
| diffstat | 7 files changed, 41 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Mar 27 13:36:12 2010 +0300 +++ b/ChangeLog Sat Mar 27 13:49:18 2010 +0300 @@ -1,3 +1,8 @@ +2010-03-27 Eli Zaretskii <eliz@gnu.org> + + * config.bat <lib-src>: Edit out lines that begin with several # + characters. + 2010-03-20 Dan Nicolaescu <dann@ics.uci.edu> * configure.in: Remove support for old UNIX System V systems and
--- a/config.bat Sat Mar 27 13:36:12 2010 +0300 +++ b/config.bat Sat Mar 27 13:49:18 2010 +0300 @@ -222,7 +222,7 @@ Echo Configuring the library source directory... cd lib-src rem Create "makefile" from "makefile.in". -sed -e "1,/== start of cpp stuff ==/s@^#[ ].*$@@" <Makefile.in >junk.c +sed -e "1,/== start of cpp stuff ==/s@^##*[ ].*$@@" <Makefile.in >junk.c gcc -E -traditional -I. -I../src junk.c | sed -e "s/^ / /" -e "/^#/d" -e "/^[ ]*$/d" >makefile.new If "%DJGPP_VER%" == "2" goto libsrc-v2 sed -f ../msdos/sed3.inp <makefile.new >Makefile
--- a/msdos/ChangeLog Sat Mar 27 13:36:12 2010 +0300 +++ b/msdos/ChangeLog Sat Mar 27 13:49:18 2010 +0300 @@ -1,3 +1,17 @@ +2010-03-27 Eli Zaretskii <eliz@gnu.org> + + * sedlisp.inp (VPATH): Don't edit, no longer needed. + (lisp, srcdir): Adapt to lisp/Makefile.in changes. + (abs_top_builddir): New edit. + + * sed3v2.inp (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB) + (LIBHESIOD, LIBRESOLV, LIBS_MAIL): Edit to empty values. + + * sed3.inp (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB) + (LIBHESIOD, LIBRESOLV, LIBS_MAIL): Edit to empty values. + + * sed1v2.inp (abs_builddir): Edit into "../src". + 2010-03-10 Chong Yidong <cyd@stupidchicken.com> * Branch for 23.2.
--- a/msdos/sed1v2.inp Sat Mar 27 13:36:12 2010 +0300 +++ b/msdos/sed1v2.inp Sat Mar 27 13:49:18 2010 +0300 @@ -29,6 +29,7 @@ /^MAKE *=/s/^/# / /^SHELL *=/s/^/# / /^srcdir *=/s/@[^@\n]*@/./ +/^abs_builddir *=/s|@abs_builddir@|../src| /^VPATH *=/s/@[^@\n]*@/./ /^CC *=/s/@[^@\n]*@/gcc/ /^CPP *=/s/@[^@\n]*@/gcc -e/
--- a/msdos/sed3.inp Sat Mar 27 13:36:12 2010 +0300 +++ b/msdos/sed3.inp Sat Mar 27 13:49:18 2010 +0300 @@ -28,6 +28,14 @@ /^libdir *=/s!=.*$!=/emacs/bin! /^srcdir *=/s!=.*$!=.! /^VPATH *=/s!=.*$!=.! +/^KRB4LIB *=/s/@[^@\n]*@//g +/^DESLIB *=/s/@[^@\n]*@//g +/^KRB5LIB *=/s/@[^@\n]*@//g +/^CRYPTOLIB *=/s/@[^@\n]*@//g +/^COM_ERRLIB *=/s/@[^@\n]*@//g +/^LIBHESIOD *=/s/@[^@\n]*@//g +/^LIBRESOLV *=/s/@[^@\n]*@//g +/^LIBS_MAIL *=/s/@[^@\n]*@//g /^CFLAGS *=/s!=.*$!=-O2 -g! /^C_SWITCH_SYSTEM *=/s!=.*$!=-DMSDOS! /^LOADLIBES *=/s!=.*$!=!
--- a/msdos/sed3v2.inp Sat Mar 27 13:36:12 2010 +0300 +++ b/msdos/sed3v2.inp Sat Mar 27 13:49:18 2010 +0300 @@ -26,6 +26,14 @@ /^libdir *=/s!=.*$!=/emacs/bin! /^srcdir=/s!srcdir=@srcdir@!srcdir := $(subst \\,/,$(shell command.com /c cd))! /^VPATH *=/s!=.*$!=.! +/^KRB4LIB *=/s/@[^@\n]*@//g +/^DESLIB *=/s/@[^@\n]*@//g +/^KRB5LIB *=/s/@[^@\n]*@//g +/^CRYPTOLIB *=/s/@[^@\n]*@//g +/^COM_ERRLIB *=/s/@[^@\n]*@//g +/^LIBHESIOD *=/s/@[^@\n]*@//g +/^LIBRESOLV *=/s/@[^@\n]*@//g +/^LIBS_MAIL *=/s/@[^@\n]*@//g /^CFLAGS *=/s!=.*$!=-O2 -g! /^C_SWITCH_SYSTEM *=/s!=.*$!=-DMSDOS! /^LOADLIBES *=/s!=.*$!=!
--- a/msdos/sedlisp.inp Sat Mar 27 13:36:12 2010 +0300 +++ b/msdos/sedlisp.inp Sat Mar 27 13:49:18 2010 +0300 @@ -20,8 +20,9 @@ /^SHELL *=/i\ export FNCASE=y -/^lisp=/s|@srcdir@|$(CURDIR)| -/^VPATH=/s|@srcdir@|.| -/^srcdir=/s|@srcdir@|.| +/^lisp *=/s|\$(srcdir)|$(CURDIR)| +/^srcdir *=/s|@srcdir@|.| +/^top_srcdir *=/s|@top_srcdir@|./..| +/^abs_top_builddir *=/s|@abs_top_builddir@|$(CURDIR)/..| # arch-tag: da7a3cff-4839-4ad7-bbe3-e2b61c84c38e