3 files changed, 20 insertions, 6 deletions

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index e0b3a965402..10cb8c7daed 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-04  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * sed1v2.inp (M_FILE, S_FILE): Add $(srcdir)/ prefix.
+
+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 3c1770d1ba1..e2384ef2866 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -128,15 +128,15 @@ s/\.h\.in/.h-in/
 /^DEPFLAGS *=/s/@DEPFLAGS@//
 /^MKDEPDIR *=/s/@MKDEPDIR@//
 /^version *=/s/@[^@\n]*@//
-/^M_FILE *=/s!@[^@\n]*@!m/intel386.h!
-/^S_FILE *=/s!@[^@\n]*@!s/msdos.h!
+/^M_FILE *=/s!@M_FILE@!$(srcdir)/m/intel386.h!
+/^S_FILE *=/s!@S_FILE@!$(srcdir)/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 @@ 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 f8ad38e4dd9..2382971c30c 100644
--- 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