Commit 2201e7e2 authored by Eli Zaretskii's avatar Eli Zaretskii

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".
parent 5b5922f5
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> 2010-03-20 Dan Nicolaescu <dann@ics.uci.edu>
* configure.in: Remove support for old UNIX System V systems and * configure.in: Remove support for old UNIX System V systems and
......
...@@ -222,7 +222,7 @@ rem ---------------------------------------------------------------------- ...@@ -222,7 +222,7 @@ rem ----------------------------------------------------------------------
Echo Configuring the library source directory... Echo Configuring the library source directory...
cd lib-src cd lib-src
rem Create "makefile" from "makefile.in". 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 gcc -E -traditional -I. -I../src junk.c | sed -e "s/^ / /" -e "/^#/d" -e "/^[ ]*$/d" >makefile.new
If "%DJGPP_VER%" == "2" goto libsrc-v2 If "%DJGPP_VER%" == "2" goto libsrc-v2
sed -f ../msdos/sed3.inp <makefile.new >Makefile sed -f ../msdos/sed3.inp <makefile.new >Makefile
......
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> 2010-03-10 Chong Yidong <cyd@stupidchicken.com>
* Branch for 23.2. * Branch for 23.2.
......
...@@ -29,6 +29,7 @@ s/\.h\.in/.h-in/ ...@@ -29,6 +29,7 @@ s/\.h\.in/.h-in/
/^MAKE *=/s/^/# / /^MAKE *=/s/^/# /
/^SHELL *=/s/^/# / /^SHELL *=/s/^/# /
/^srcdir *=/s/@[^@\n]*@/./ /^srcdir *=/s/@[^@\n]*@/./
/^abs_builddir *=/s|@abs_builddir@|../src|
/^VPATH *=/s/@[^@\n]*@/./ /^VPATH *=/s/@[^@\n]*@/./
/^CC *=/s/@[^@\n]*@/gcc/ /^CC *=/s/@[^@\n]*@/gcc/
/^CPP *=/s/@[^@\n]*@/gcc -e/ /^CPP *=/s/@[^@\n]*@/gcc -e/
......
...@@ -28,6 +28,14 @@ ...@@ -28,6 +28,14 @@
/^libdir *=/s!=.*$!=/emacs/bin! /^libdir *=/s!=.*$!=/emacs/bin!
/^srcdir *=/s!=.*$!=.! /^srcdir *=/s!=.*$!=.!
/^VPATH *=/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! /^CFLAGS *=/s!=.*$!=-O2 -g!
/^C_SWITCH_SYSTEM *=/s!=.*$!=-DMSDOS! /^C_SWITCH_SYSTEM *=/s!=.*$!=-DMSDOS!
/^LOADLIBES *=/s!=.*$!=! /^LOADLIBES *=/s!=.*$!=!
......
...@@ -26,6 +26,14 @@ ...@@ -26,6 +26,14 @@
/^libdir *=/s!=.*$!=/emacs/bin! /^libdir *=/s!=.*$!=/emacs/bin!
/^srcdir=/s!srcdir=@srcdir@!srcdir := $(subst \\,/,$(shell command.com /c cd))! /^srcdir=/s!srcdir=@srcdir@!srcdir := $(subst \\,/,$(shell command.com /c cd))!
/^VPATH *=/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! /^CFLAGS *=/s!=.*$!=-O2 -g!
/^C_SWITCH_SYSTEM *=/s!=.*$!=-DMSDOS! /^C_SWITCH_SYSTEM *=/s!=.*$!=-DMSDOS!
/^LOADLIBES *=/s!=.*$!=! /^LOADLIBES *=/s!=.*$!=!
......
...@@ -20,8 +20,9 @@ ...@@ -20,8 +20,9 @@
/^SHELL *=/i\ /^SHELL *=/i\
export FNCASE=y export FNCASE=y
/^lisp=/s|@srcdir@|$(CURDIR)| /^lisp *=/s|\$(srcdir)|$(CURDIR)|
/^VPATH=/s|@srcdir@|.| /^srcdir *=/s|@srcdir@|.|
/^srcdir=/s|@srcdir@|.| /^top_srcdir *=/s|@top_srcdir@|./..|
/^abs_top_builddir *=/s|@abs_top_builddir@|$(CURDIR)/..|
# arch-tag: da7a3cff-4839-4ad7-bbe3-e2b61c84c38e # arch-tag: da7a3cff-4839-4ad7-bbe3-e2b61c84c38e
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment