diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2023-09-30 13:50:07 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2023-09-30 13:50:07 -0400 |
| commit | 46978fa1eff286ea15248ee358fe62608ca070c5 (patch) | |
| tree | a9cce889b60229e11006585e276a018719e5fdad /leim | |
| parent | e6dd64aaba55b93340de1d7e0d6783da6de2af2f (diff) | |
| parent | 4776d90c31b3d5bc4117ca7ecde95444adf402ac (diff) | |
| download | emacs-46978fa1eff286ea15248ee358fe62608ca070c5.tar.gz | |
Merge from origin/emacs-29
4776d90c31b Add new Tramp test
ca5b48fd76d Fix tmm-mid-prompt :type (Bug#66179)
7447d3df94e Fix tree-sitter indentation conflict with multiple languages
bee18e52737 Fix bug#66093 in Tramp
7d5fee0feaa Support regeneration of ja-dic.el under '--with-small-ja-...
Conflicts:
make-dist
Diffstat (limited to 'leim')
| -rw-r--r-- | leim/Makefile.in | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/leim/Makefile.in b/leim/Makefile.in index 4c6c3179283..f7dfdf66f30 100644 --- a/leim/Makefile.in +++ b/leim/Makefile.in @@ -26,6 +26,7 @@ SHELL = @SHELL@ # Here are the things that we expect ../configure to edit. srcdir=@srcdir@ top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ # Where the generated files go. leimdir = ${srcdir}/../lisp/leim @@ -134,9 +135,15 @@ ${leimdir}/leim-list.el: ${srcdir}/leim-ext.el ${TIT_MISC} ${leimdir}/ja-dic/ja-dic.el: | $(leimdir)/ja-dic +# This is used to support regeneration of ja-dic when the SMALL_JA_DIC +# option is flipped by the configure-time option. +small-ja-dic-option: ../config.status + $(AM_V_GEN)echo "Small ja-dic option: $(SMALL_JA_DIC)" > $@.$$$$ && \ + ${top_srcdir}/build-aux/move-if-change $@.$$$$ $@ + .PHONY: generate-ja-dic generate-ja-dic: ${leimdir}/ja-dic/ja-dic.el -${leimdir}/ja-dic/ja-dic.el: $(srcdir)/SKK-DIC/SKK-JISYO.L +${leimdir}/ja-dic/ja-dic.el: $(srcdir)/SKK-DIC/SKK-JISYO.L small-ja-dic-option $(AM_V_GEN)$(RUN_EMACS) -batch -l ja-dic-cnv \ -f batch-skkdic-convert -dir "$(leimdir)/ja-dic" $(JA_DIC_NO_REDUCTION_OPTION) "$<" |