diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2012-04-21 12:48:42 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2012-04-21 12:48:42 +0300 |
| commit | b42287d22df7fe18831e2355429eec1761d97202 (patch) | |
| tree | a965d23a1ebe2560db5c1625f4bda998200b33fc /msdos | |
| parent | 6114eb15032b89b19029b17b869299e290e56704 (diff) | |
| download | emacs-b42287d22df7fe18831e2355429eec1761d97202.tar.gz | |
Fix the build after 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.
Diffstat (limited to 'msdos')
| -rw-r--r-- | msdos/ChangeLog | 12 | ||||
| -rw-r--r-- | msdos/sed1v2.inp | 2 | ||||
| -rw-r--r-- | msdos/sedleim.inp | 19 |
3 files changed, 29 insertions, 4 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 82f877eee9e..603baa978e0 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,15 @@ +2012-04-21 Eli Zaretskii <eliz@gnu.org> + + * 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 <eggert@cs.ucla.edu> configure: new option --enable-gcc-warnings (Bug#11207) diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp index ce245b08824..b9e94afea51 100644 --- a/msdos/sed1v2.inp +++ b/msdos/sed1v2.inp @@ -152,6 +152,8 @@ s/^ [^ ]*move-if-change / update / /^ 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`|.| diff --git a/msdos/sedleim.inp b/msdos/sedleim.inp index 773934e64aa..41f87d92047 100644 --- a/msdos/sedleim.inp +++ b/msdos/sedleim.inp @@ -33,14 +33,11 @@ s|\([ ]\)echo|\1djecho|g /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 @@ RUN_EMACS = ${BUILT_EMACS} -batch --no-site-file /^ --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| |