[Emacs-diffs] /srv/bzr/emacs/trunk r101977: Fix the MSDOS build broken by last revisions.

[Eli Zaretskii]

------------------------------------------------------------
revno: 101977 [merge]
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2010-10-15 20:45:12 +0200
message:
  Fix the MSDOS build broken by last revisions.
  
   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.
   src/unexcoff.c (make_hdr): Fix prototype according to changes in
   revno 101757.
modified:
  msdos/ChangeLog
  msdos/sed1v2.inp
  msdos/sed6.inp
  src/ChangeLog
  src/unexcoff.c

=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog   2010-10-10 15:35:04 +0000
+++ b/msdos/ChangeLog   2010-10-15 18:42:54 +0000
@@ -1,3 +1,11 @@
+2010-10-15  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * sed1v2.inp (PROFILING_LDFLAGS):

=== modified file 'msdos/sed1v2.inp'
--- a/msdos/sed1v2.inp  2010-10-10 15:35:04 +0000
+++ b/msdos/sed1v2.inp  2010-10-15 18:42:54 +0000
@@ -131,12 +131,12 @@
 /^M_FILE *=/address@hidden@address@hidden/intel386.h!
 /^S_FILE *=/address@hidden@address@hidden/msdos.h!
 /address@hidden@$/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 $@ >/

=== modified file 'msdos/sed6.inp'
--- a/msdos/sed6.inp    2010-01-13 08:35:10 +0000
+++ b/msdos/sed6.inp    2010-10-15 18:42:54 +0000
@@ -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

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-10-15 10:10:20 +0000
+++ b/src/ChangeLog     2010-10-15 18:42:54 +0000
@@ -1,5 +1,8 @@
 2010-10-15  Eli Zaretskii  <address@hidden>
 
+       * 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  <address@hidden>

=== modified file 'src/unexcoff.c'
--- a/src/unexcoff.c    2010-10-04 17:22:57 +0000
+++ b/src/unexcoff.c    2010-10-15 18:42:54 +0000
@@ -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 *);