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

diff --git a/ChangeLog b/ChangeLog
index ca960a4ee1c49d7305406b9b1aa8acde88ac8104..26a38fedcfa2e4a23b18b2be0b9e37247472a179 100644 (file)
--- 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 f2eb0262e6029a824a20eeb76791a2d4e6e5a0ef..5a0e9168fa3482eb8161634389deda2a8a007695 100644 (file)
--- a/config.bat
+++ b/config.bat
@@ -222,7 +222,7 @@ rem   ----------------------------------------------------------------------
 Echo Configuring the library source directory...\r
 cd lib-src\r
 rem   Create "makefile" from "makefile.in".\r
-sed -e "1,/== start of cpp stuff ==/s@^#[      ].*$@@" <Makefile.in >junk.c\r
+sed -e "1,/== start of cpp stuff ==/s@^##*[    ].*$@@" <Makefile.in >junk.c\r
 gcc -E -traditional -I. -I../src junk.c | sed -e "s/^ /        /" -e "/^#/d" -e "/^[   \f]*$/d" >makefile.new\r
 If "%DJGPP_VER%" == "2" goto libsrc-v2\r
 sed -f ../msdos/sed3.inp <makefile.new >Makefile\r

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 2a2c62eaa31fa8f396db184c5fc50ef9438ca92f..e0b31ecbd50e778b3e6663aff85f007abe2afff7 100644 (file)
--- 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 b52b088b617a9f555a48710b2f3faae5de35584f..814a633ee2b79875d8a3e9972b7278f1576f574b 100644 (file)
--- 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 21a8e32ab8b66253137bbb638fee4367ef433b8d..8f97b309d2e6f0db5fc6b5167226e5f29c20d84a 100644 (file)
--- 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 faabfc8c30535b9baa4957f598f4dfc4b68310ee..5dcde810c825524438a7747746781f378d9292cc 100644 (file)
--- 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 f00ca986601c24d17d1367e14e1021b4613f1d9d..152dafbaa39226e470a3e59eed83680a3ee61d5d 100644 (file)
--- 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