[Emacs-diffs] /srv/bzr/emacs/trunk r107982: Fix the MS-DOS build broken by recent leim-related changes.

[Eli Zaretskii]

------------------------------------------------------------
revno: 107982 [merge]
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2012-04-21 12:53:00 +0300
message:
  Fix the MS-DOS build broken by recent leim-related changes.
  
   msdos/sedleim.inp (RUN_EMACS): Replace BUILT_EMACS with EMACS.
   Remove stale editing of "else make quail".
   (.PHONY, compile-targets): Remove targets.
   (compile-main): Edit into something that can be done without
   requiring a Unixy shell.
   (bootstrap-clean): Likewise: edit to not require $(setwins).
   msdos/sed1v2.inp: Edit "cd $(leimdir) && $(MAKE) ..." into the
   equivalent "$(MAKE) $(MFLAGS) -C $(leimdir) ..." command.
modified:
  msdos/ChangeLog
  msdos/sed1v2.inp
  msdos/sedleim.inp

=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog   2012-04-18 16:45:13 +0000
+++ b/msdos/ChangeLog   2012-04-21 09:48:42 +0000
@@ -1,3 +1,15 @@
+2012-04-21  Eli Zaretskii  <address@hidden>
+
+       * sedleim.inp (RUN_EMACS): Replace BUILT_EMACS with EMACS.
+       Remove stale editing of "else make quail".
+       (.PHONY, compile-targets): Remove targets.
+       (compile-main): Edit into something that can be done without
+       requiring a Unixy shell.
+       (bootstrap-clean): Likewise: edit to not require $(setwins).
+
+       * sed1v2.inp: Edit "cd $(leimdir) && $(MAKE) ..." into the
+       equivalent "$(MAKE) $(MFLAGS) -C $(leimdir) ..." command.
+
 2012-04-18  Paul Eggert  <address@hidden>
 
        configure: new option --enable-gcc-warnings (Bug#11207)

=== modified file 'msdos/sed1v2.inp'
--- a/msdos/sed1v2.inp  2012-04-14 05:04:54 +0000
+++ b/msdos/sed1v2.inp  2012-04-21 09:48:42 +0000
@@ -152,6 +152,8 @@
 /^     echo[   ][      ]*timestamp/s/echo /djecho /
 /^     .*djecho timestamp/a\
        @rm -f gl-tmp
+/^     cd \$(leimdir) && \$(MAKE)/c\
+       $(MAKE) $(MFLAGS) -C $(leimdir) leim-list.el EMACS=$(bootstrap_exe)
 /^     cd \$(lib) && \$(MAKE)/c\
        $(MAKE) $(MFLAGS) -C $(lib) libgnu.a
 /^RUN_TEMACS *=/s|`/bin/pwd`|.|

=== modified file 'msdos/sedleim.inp'
--- a/msdos/sedleim.inp 2012-01-19 07:21:25 +0000
+++ b/msdos/sedleim.inp 2012-04-21 09:48:42 +0000
@@ -33,14 +33,11 @@
 
 /RUN_EMACS *=/,/^$/c\
 export EMACSLOADPATH=${buildlisppath}\
-RUN_EMACS = ${BUILT_EMACS} -batch --no-site-file
+RUN_EMACS = ${EMACS} -batch --no-site-file
 
 /^     cd ../c\
        ${MAKE} -C ../src ${MFLAGS} emacs
 
-/else make quail/c\
-       if not exist quail\\nul make quail
-
 /if \[ -f $@ \]\; then true/d
 /fi$/s/; fi$//
 
@@ -51,9 +48,23 @@
        /^      --eval/,/; \\$/s|\; \\||
 }
 
+/^setwins=/,/^$/d
+/^\.PHONY: compile-targets/d
+/^compile-targets:/d
+/^compile-main:/,/^$/c\
+compile-main: ${TIT_MISC}\
+       $(MAKE) $(MFLAGS) $(foreach f,$(wildcard ja-dic/*.el),$(basename 
$f).elc)\
+       $(MAKE) $(MFLAGS) $(foreach f,$(wildcard quail/*.el),$(basename 
$f).elc)\
+
+
 /^install:/,/^$/c\
 install: all\
 
+/^bootstrap-clean:/,/^$/c\
+bootstrap-clean: clean\
+       rm -f ja-dic/*.elc quail/*.elc\
+
+
 /^     if test -f/d
 /^distclean:/,/^$/ {
        s|\(rm -f Makefile\)|\1 stamp-subdir|