Sync better from sources.

[bpt/emacs.git] / leim / Makefile.in

diff --git a/leim/Makefile.in b/leim/Makefile.in
index 21bea3c..33d68b7 100644 (file)
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -34,8 +34,8 @@ leimdir = ${srcdir}/../lisp/leim
 EMACS = ../src/emacs
 
 # How to run Emacs.
-# Prevent any setting of EMACSLOADPATH in user environment causing problems.
-RUN_EMACS = EMACSLOADPATH= "${EMACS}" -batch --no-site-file --no-site-lisp
+RUN_EMACS = EMACSLOADPATH='$(srcdir)/../lisp' '$(EMACS)' \
+  -batch --no-site-file --no-site-lisp
 
 MKDIR_P = @MKDIR_P@
 
@@ -132,7 +132,7 @@ ${leimdir}/leim-list.el: ${TIT_MISC} ${srcdir}/leim-ext.el
        rm -f $@
        ${RUN_EMACS} -l international/quail \
          --eval "(update-leim-list-file (unmsys--file-name \"${leimdir}\"))"
-       sed -n '/^[^;]/ p' < ${srcdir}/leim-ext.el >> $@
+       sed -n -e '/^[^;]/p' -e 's/^;\(;*\)inc /;\1 /p' < ${srcdir}/leim-ext.el >> $@
 
 ${leimdir}/ja-dic/ja-dic.el: $(srcdir)/SKK-DIC/SKK-JISYO.L
        @$(MKDIR_P) $(leimdir)/ja-dic
@@ -140,16 +140,21 @@ ${leimdir}/ja-dic/ja-dic.el: $(srcdir)/SKK-DIC/SKK-JISYO.L
          -f batch-skkdic-convert -dir "$(leimdir)/ja-dic" \
          "$(srcdir)/SKK-DIC/SKK-JISYO.L"
 
-.PHONY: bootstrap-clean distclean maintainer-clean
+.PHONY: bootstrap-clean distclean maintainer-clean extraclean
 
 bootstrap-clean:
-       rm -f ${TIT_MISC} ${TIT_MISC:.el=.elc} \
-         ${leimdir}/leim-list.el changed.tit changed.misc
-       rm -rf ${leimdir}/ja-dic
+       rm -f ${TIT_MISC} ${leimdir}/leim-list.el changed.tit changed.misc
 
 distclean:
        rm -f Makefile
 
 maintainer-clean: distclean bootstrap-clean
 
+## We do not delete ja-dic, even in a bootstrap, because it rarely
+## changes and is slow to regenerate.
+## TODO? Could consider doing the same with TIT_MISC, though those
+## are much faster to generate.
+extraclean:
+       rm -rf ${leimdir}/ja-dic
+
 ### Makefile.in ends here