# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1287168174 -7200
# Node ID 98fd8b0e411d5f1e5e9d76f4a006495ab34ed4df
# Parent  43818f2cbca0792310c7b4e8b5a016e24cea26b1
Fix the MSDOS build broken by latest revisions.

 src/unexcoff.c (make_hdr): Fix prototype according to changes in
 revno 101757.
 msdos/sed1v2.inp: Use $(..) instead of ${..} in all edit commands.
 Needed because of changes in revno 101897.
 msdos/sed6.inp (mkinfodir): Edit to avoid Unix shell-isms.  Needed
 because of changes in revno 101876.

diff -r 43818f2cbca0 -r 98fd8b0e411d msdos/ChangeLog
--- a/msdos/ChangeLog	Fri Oct 15 14:07:38 2010 +0200
+++ b/msdos/ChangeLog	Fri Oct 15 20:42:54 2010 +0200
@@ -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 revno 101897.
+
+	* sed6.inp (mkinfodir): Edit to avoid Unix shell-isms.  Needed
+	because of changes in revno 101876.
+
 2010-10-10  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* sed1v2.inp (PROFILING_LDFLAGS):
diff -r 43818f2cbca0 -r 98fd8b0e411d msdos/sed1v2.inp
--- a/msdos/sed1v2.inp	Fri Oct 15 14:07:38 2010 +0200
+++ b/msdos/sed1v2.inp	Fri Oct 15 20:42:54 2010 +0200
@@ -131,12 +131,12 @@
 /^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!>.*$!!
 /^[ 	]*$/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 @@
 /^	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 -r 43818f2cbca0 -r 98fd8b0e411d msdos/sed6.inp
--- a/msdos/sed6.inp	Fri Oct 15 14:07:38 2010 +0200
+++ b/msdos/sed6.inp	Fri Oct 15 20:42:54 2010 +0200
@@ -43,4 +43,6 @@
   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 -r 43818f2cbca0 -r 98fd8b0e411d src/ChangeLog
--- a/src/ChangeLog	Fri Oct 15 14:07:38 2010 +0200
+++ b/src/ChangeLog	Fri Oct 15 20:42:54 2010 +0200
@@ -1,5 +1,8 @@
 2010-10-15  Eli Zaretskii  <eliz@gnu.org>
 
+	* unexcoff.c (make_hdr): Fix prototype according to changes in
+	revno 101757.
+
 	* image.c (tiff_load): Cast 3rd argument to avoid compiler warning.
 
 2010-10-15  Tassilo Horn  <tassilo@member.fsf.org>
diff -r 43818f2cbca0 -r 98fd8b0e411d src/unexcoff.c
--- a/src/unexcoff.c	Fri Oct 15 14:07:38 2010 +0200
+++ b/src/unexcoff.c	Fri Oct 15 20:42:54 2010 +0200
@@ -141,8 +141,7 @@
   error (msg, a1, a2);
 }
 
-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 *);