diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | config.bat | 2 | ||||
| -rw-r--r-- | msdos/ChangeLog | 14 | ||||
| -rw-r--r-- | msdos/sed1v2.inp | 1 | ||||
| -rw-r--r-- | msdos/sed3.inp | 8 | ||||
| -rw-r--r-- | msdos/sed3v2.inp | 8 | ||||
| -rw-r--r-- | msdos/sedlisp.inp | 7 |
7 files changed, 41 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index ca960a4ee1c..26a38fedcfa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/config.bat b/config.bat index f2eb0262e60..5a0e9168fa3 100644 --- a/config.bat +++ b/config.bat @@ -222,7 +222,7 @@ rem ---------------------------------------------------------------------- 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
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 2a2c62eaa31..e0b31ecbd50 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -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. diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index b52b088b617..814a633ee2b 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -29,6 +29,7 @@ s/\.h\.in/.h-in/ /^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/ diff --git a/msdos/sed3.inp b/msdos/sed3.inp index 21a8e32ab8b..8f97b309d2e 100644 --- a/msdos/sed3.inp +++ b/msdos/sed3.inp @@ -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!=.*$!=! diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp index faabfc8c305..5dcde810c82 100644 --- a/msdos/sed3v2.inp +++ b/msdos/sed3v2.inp @@ -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!=.*$!=! diff --git a/msdos/sedlisp.inp b/msdos/sedlisp.inp index f00ca986601..152dafbaa39 100644 --- a/msdos/sedlisp.inp +++ b/msdos/sedlisp.inp @@ -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 |