Fix bug #15260 with building and installing Emacs in non-ASCII directories.

[gnu-emacs] / leim / Makefile.in

diff --git a/leim/Makefile.in b/leim/Makefile.in
index f61ab42b9f3ac810b70626c256c873f32829a069..a5c05d567ec4f2bac889964adc6ea4ae5afba3f4 100644 (file)
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -1,6 +1,6 @@
-# Makefile for leim subdirectory in GNU Emacs.
+### @configure_input@
 
-# Copyright (C) 1997-2012 Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 #   2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
@@ -21,10 +21,7 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-
-# Avoid trouble on systems where the `SHELL' variable might be
-# inherited from the environment.
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 # Here are the things that we expect ../configure to edit.
 srcdir=@srcdir@
@@ -33,11 +30,10 @@ srcdir=@srcdir@
 # byte-compile Emacs Lisp files, and generate the file leim-list.el.
 EMACS = ../src/emacs
 
-buildlisppath=${srcdir}/../lisp
-
 # How to run Emacs.
-RUN_EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \
-       ${EMACS} -batch --no-site-file --no-site-lisp
+# Prevent any setting of EMACSLOADPATH in user environment causing problems.
+RUN_EMACS = unset EMACSLOADPATH; "${EMACS}" -batch \
+       --no-site-file --no-site-lisp
 
 MKDIR_P = @MKDIR_P@
 
@@ -79,7 +75,7 @@ TIT_MISC=${CHINESE_TIT} ${MISC}
 
 .el.elc:
        @echo Compiling $<
-       @${RUN_EMACS} -l ${buildlisppath}/international/quail -f batch-byte-compile $<
+       @${RUN_EMACS} -l international/quail -f batch-byte-compile $<
 
 all: leim-list.el compile-main
 .PHONY: all
@@ -112,7 +108,7 @@ ${CHINESE_TIT}: changed.tit
 ## It doesn't seem possible to do this with VPATH and suffix rules.
 changed.tit: ${TIT_SOURCES}
        @${MKDIR_P} quail
-       ${RUN_EMACS} -l ${buildlisppath}/international/titdic-cnv \
+       ${RUN_EMACS} -l titdic-cnv \
          -f batch-titdic-convert -dir quail ${srcdir}/CXTERM-DIC; \
          echo "changed" > $@
 
@@ -129,24 +125,30 @@ ${MISC}: changed.misc
 
 changed.misc: ${MISC_SOURCES}
        @${MKDIR_P} quail
-       ${RUN_EMACS} -l ${buildlisppath}/international/titdic-cnv \
+       ${RUN_EMACS} -l titdic-cnv \
          -f batch-miscdic-convert -dir quail ${srcdir}/MISC-DIC; \
          echo "changed" > $@
 
 leim-list.el: ${TIT_MISC} ${srcdir}/leim-ext.el
        rm -f leim-list.el
-       if [ x`cd ${srcdir} && /bin/pwd` = x`/bin/pwd` ] ; then \
-         ${RUN_EMACS} -l ${buildlisppath}/international/quail \
+       if [ "`cd ${srcdir} && /bin/pwd`" = "`/bin/pwd`" ] ; then \
+         ${RUN_EMACS} -l international/quail \
            --eval "(update-leim-list-file \".\")" ; \
        else \
-         ${RUN_EMACS} -l ${buildlisppath}/international/quail \
-           --eval "(update-leim-list-file \".\" \"${srcdir}\")" ; \
+         ${RUN_EMACS} -l international/quail \
+           --eval "(update-leim-list-file \".\" (unmsys--file-name \"${srcdir}\"))" ; \
        fi
        sed -n '/^[^;]/ p' < ${srcdir}/leim-ext.el >> $@
 
+$(srcdir)/ja-dic/ja-dic.el: $(srcdir)/SKK-DIC/SKK-JISYO.L
+       @$(MKDIR_P) $(srcdir)/ja-dic
+       $(RUN_EMACS) -batch -l ja-dic-cnv \
+         -f batch-skkdic-convert -dir "$(srcdir)/ja-dic" \
+         "$(srcdir)/SKK-DIC/SKK-JISYO.L"
+
 ## Following adapted from lisp/Makefile.in.
 setwins=wins="${srcdir}/ja-dic quail"; \
-       [ `cd ${srcdir} && /bin/pwd` != `/bin/pwd` ] && \
+       [ "`cd ${srcdir} && /bin/pwd`" != "`/bin/pwd`" ] && \
        wins="$$wins ${srcdir}/quail"
 
 .PHONY: compile-targets
@@ -156,7 +158,7 @@ compile-targets: $(TARGETS)
 # Compile all the Elisp files that need it.  Beware: it approximates
 # `no-byte-compile', so watch out for false-positives!
 .PHONY: compile-main
-compile-main: ${TIT_MISC}
+compile-main: ${TIT_MISC} $(srcdir)/ja-dic/ja-dic.el
        @($(setwins); \
        els=`echo "$$wins " | sed -e 's| |/*.el |g'`; \
        for el in $$els; do \
@@ -181,7 +183,7 @@ bootstrap-clean: clean
        $(setwins); for w in $$wins; do rm -f $$w/*.elc; done
 
 distclean: clean
-       -[ `cd ${srcdir} && /bin/pwd` != `/bin/pwd` ] && rm -rf quail
+       -[ "`cd ${srcdir} && /bin/pwd`" != "`/bin/pwd`" ] && rm -rf quail
        rm -f Makefile
 
 maintainer-clean: distclean bootstrap-clean
@@ -192,5 +194,5 @@ extraclean: maintainer-clean
 .PHONY: check-declare
 
 check-declare:
-       $(RUN_EMACS) -l $(buildlisppath)/emacs-lisp/check-declare \
-         --eval '(check-declare-directory "$(srcdir)")'
+       $(RUN_EMACS) -l check-declare \
+         --eval '(check-declare-directory (unmsys--file-name "$(srcdir)"))'