[Emacs-diffs] /srv/bzr/emacs/trunk r99754: Fix the MSDOS build as fallout from the latest Makefile.in changes.

[Eli Zaretskii]

------------------------------------------------------------
revno: 99754
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2010-03-27 13:49:18 +0300
message:
  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".
modified:
  ChangeLog
  config.bat
  msdos/ChangeLog
  msdos/sed1v2.inp
  msdos/sed3.inp
  msdos/sed3v2.inp
  msdos/sedlisp.inp

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-03-20 06:48:13 +0000
+++ b/ChangeLog 2010-03-27 10:49:18 +0000
@@ -1,3 +1,8 @@
+2010-03-27  Eli Zaretskii  <address@hidden>
+
+       * config.bat <lib-src>: Edit out lines that begin with several #
+       characters.
+
 2010-03-20  Dan Nicolaescu  <address@hidden>
 
        * configure.in: Remove support for old UNIX System V systems and

=== modified file 'config.bat'
--- a/config.bat        2010-01-13 08:35:10 +0000
+++ b/config.bat        2010-03-27 10:49:18 +0000
@@ -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 ==/address@hidden     ].*$@@" <Makefile.in 
>junk.c
+sed -e "1,/== start of cpp stuff ==/address@hidden     ].*$@@" <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

=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog   2010-03-10 15:17:13 +0000
+++ b/msdos/ChangeLog   2010-03-27 10:49:18 +0000
@@ -1,3 +1,17 @@
+2010-03-27  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * Branch for 23.2.

=== modified file 'msdos/sed1v2.inp'
--- a/msdos/sed1v2.inp  2010-01-13 08:35:10 +0000
+++ b/msdos/sed1v2.inp  2010-03-27 10:49:18 +0000
@@ -29,6 +29,7 @@
 /^MAKE *=/s/^/# /
 /^SHELL *=/s/^/# /
 /^srcdir *=/s/@address@hidden@/./
+/^abs_builddir *=/s|@abs_builddir@|../src|
 /^VPATH *=/s/@address@hidden@/./
 /^CC *=/s/@address@hidden@/gcc/
 /^CPP *=/s/@address@hidden@/gcc -e/

=== modified file 'msdos/sed3.inp'
--- a/msdos/sed3.inp    2010-01-13 08:35:10 +0000
+++ b/msdos/sed3.inp    2010-03-27 10:49:18 +0000
@@ -28,6 +28,14 @@
 /^libdir *=/s!=.*$!=/emacs/bin!
 /^srcdir *=/s!=.*$!=.!
 /^VPATH *=/s!=.*$!=.!
+/^KRB4LIB *=/s/@address@hidden@//g
+/^DESLIB *=/s/@address@hidden@//g
+/^KRB5LIB *=/s/@address@hidden@//g
+/^CRYPTOLIB *=/s/@address@hidden@//g
+/^COM_ERRLIB *=/s/@address@hidden@//g
+/^LIBHESIOD *=/s/@address@hidden@//g
+/^LIBRESOLV *=/s/@address@hidden@//g
+/^LIBS_MAIL *=/s/@address@hidden@//g
 /^CFLAGS *=/s!=.*$!=-O2 -g!
 /^C_SWITCH_SYSTEM *=/s!=.*$!=-DMSDOS!
 /^LOADLIBES *=/s!=.*$!=!

=== modified file 'msdos/sed3v2.inp'
--- a/msdos/sed3v2.inp  2010-01-13 08:35:10 +0000
+++ b/msdos/sed3v2.inp  2010-03-27 10:49:18 +0000
@@ -26,6 +26,14 @@
 /^libdir *=/s!=.*$!=/emacs/bin!
 /^srcdir=/address@hidden@!srcdir := $(subst \\,/,$(shell command.com /c cd))!
 /^VPATH *=/s!=.*$!=.!
+/^KRB4LIB *=/s/@address@hidden@//g
+/^DESLIB *=/s/@address@hidden@//g
+/^KRB5LIB *=/s/@address@hidden@//g
+/^CRYPTOLIB *=/s/@address@hidden@//g
+/^COM_ERRLIB *=/s/@address@hidden@//g
+/^LIBHESIOD *=/s/@address@hidden@//g
+/^LIBRESOLV *=/s/@address@hidden@//g
+/^LIBS_MAIL *=/s/@address@hidden@//g
 /^CFLAGS *=/s!=.*$!=-O2 -g!
 /^C_SWITCH_SYSTEM *=/s!=.*$!=-DMSDOS!
 /^LOADLIBES *=/s!=.*$!=!

=== modified file 'msdos/sedlisp.inp'
--- a/msdos/sedlisp.inp 2010-01-13 08:35:10 +0000
+++ b/msdos/sedlisp.inp 2010-03-27 10:49:18 +0000
@@ -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