Fix the MSDOS build broken by latest revisions.

 src/unexcoff.c (make_hdr): Fix prototype according to changes in
 2010-10-03T13:59:56Z!dann@ics.uci.edu.
 msdos/sed1v2.inp: Use $(..) instead of ${..} in all edit commands.
 Needed because of changes in 2010-10-10T14:43:05Z!dann@ics.uci.edu.
 msdos/sed6.inp (mkinfodir): Edit to avoid Unix shell-isms.  Needed
 because of changes in 2010-10-09T18:31:12Z!rgm@gnu.org.

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index e0b3a9654020c0a3ae8203f259370fb1eb985160..4f466436ecc7e8d18cbbdeb32d24bcb059fd2dbd 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-15  Eli Zaretskii  <eliz@gnu.org>
+
+       * sed1v2.inp: Use $(..) instead of ${..} in all edit commands.
+       Needed because of changes in 2010-10-10T14:43:05Z!dann@ics.uci.edu.
+
+       * sed6.inp (mkinfodir): Edit to avoid Unix shell-isms.  Needed
+       because of changes in 2010-10-09T18:31:12Z!rgm@gnu.org.
+
 2010-10-10  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * sed1v2.inp (PROFILING_LDFLAGS):

diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index 3c1770d1ba1e8ab06e948f89bc4071f6f67e7e20..19f0d9dc0a9101bb4e523f43fad62fec582d292b 100644 (file)
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -131,12 +131,12 @@ s/\.h\.in/.h-in/
 /^M_FILE *=/s!@[^@\n]*@!m/intel386.h!
 /^S_FILE *=/s!@[^@\n]*@!s/msdos.h!
 /^@SET_MAKE@$/s/@SET_MAKE@//
-/^.\${libsrc}make-docfile.*>/s!make-docfile!make-docfile -o ../etc/DOC!
-/^.\${libsrc}make-doc/s!>.*$!!
+/^.\$(libsrc)\/make-docfile.*>/s!make-docfile!make-docfile -o ../etc/DOC!
+/^.\$(libsrc)\/make-doc/s!>.*$!!
 /^[\f   ]*$/d
 /^     if test -f/,/^  fi$/c\
        command.com /c if exist .gdbinit rm -f _gdbinit
-/^     if test "\${CANNOT_DUMP}" =/,/^ else /d
+/^     if test "\$(CANNOT_DUMP)" =/,/^ else /d
 /^     fi/d
 /^     LC_ALL=C \$(RUN_TEMACS)/i\
        stubedit temacs.exe minstack=1024k
@@ -152,7 +152,7 @@ s/ || true\; \\$//
 /^     if test -f/,/^  fi$/c\
        command.com /c if exist .gdbinit rm -f _gdbinit
 /^     #/d
-/^     cd.*make-docfile/s!$!; cd ${dot}${dot}/src!
+/^     cd.*make-docfile/s!$!; cd ../src!
 /^     @: /d
 /^     -\{0,1\} *ln -/s/ln -f/cp -pf/
 /^[    ]touch /s/touch/djecho $@ >/

diff --git a/msdos/sed6.inp b/msdos/sed6.inp
index f8ad38e4dd9055d05191f255558b1d682498a601..2382971c30c7e8b40a06fc1908e6be86509d5655 100644 (file)
--- a/msdos/sed6.inp
+++ b/msdos/sed6.inp
@@ -43,4 +43,6 @@ export texinputdir := $(srcdir)";"$(TEXINPUTS)
   s/^  for file in $(INFO_TARGETS)\; do rm -f.*$/      rm -f $(INFO_TARGETS)/
 }
 
+/^mkinfodir *=/s| @.*$|@command.com /c if not exist ..\\..\\info\\emacs mkdir ..\\..\\info|
+
 # arch-tag: defe1001-f35a-47f7-9635-3f5d33ee5e97

diff --git a/src/ChangeLog b/src/ChangeLog
index 567bf2868e767917e56c1a014beaa76e9ca878e5..b3ed712a9e5dda3a486a5adf17dd02bbc1bc3b0a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2010-10-15  Eli Zaretskii  <eliz@gnu.org>
 
+       * unexcoff.c (make_hdr): Fix prototype according to changes in
+       2010-10-03T13:59:56Z!dann@ics.uci.edu.
+
        * image.c (tiff_load): Cast 3rd argument to avoid compiler warning.
 
 2010-10-15  Tassilo Horn  <tassilo@member.fsf.org>

diff --git a/src/unexcoff.c b/src/unexcoff.c
index 0c6af414d820531dff2c93f82814c07563d5044f..fb221dacda2f53b8261ac7a1e28973336f153be8 100644 (file)
--- a/src/unexcoff.c
+++ b/src/unexcoff.c
@@ -141,8 +141,7 @@ report_error_1 (int fd, const char *msg, int a1, int a2)
   error (msg, a1, a2);
 }
 \f
-static int make_hdr (int, int, unsigned, unsigned, unsigned,
-                    const char *, const char *);
+static int make_hdr (int, int, const char *, const char *);
 static int copy_text_and_data (int, int);
 static int copy_sym (int, int, const char *, const char *);
 static void mark_x (const char *);