From bc00793e2a90838e05d76ca17f78ee1a17e4c436 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Wed, 23 Oct 2013 19:29:29 -0700
Subject: [PATCH] * leim/Makefile.in (.el.elc, changed.tit, changed.misc,
 leim-list.el) ($(srcdir)/ja-dic/ja-dic.el, check-declare): Remove unnecessary
 path in -l argument (RUN_EMACS sets EMACSLOADPATH). We just need to be
 careful because "quail" is also a directory...

---
 leim/ChangeLog   |  6 ++++++
 leim/Makefile.in | 14 +++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/leim/ChangeLog b/leim/ChangeLog
index 4a629765386..45a73f0be8c 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-24  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in (.el.elc, changed.tit, changed.misc, leim-list.el)
+	($(srcdir)/ja-dic/ja-dic.el, check-declare): Remove unnecessary
+	path in -l argument (RUN_EMACS sets EMACSLOADPATH).
+
 2013-10-23  Glenn Morris  <rgm@gnu.org>
 
 	* Makefile.in (abs_srcdir): New, set by configure.
diff --git a/leim/Makefile.in b/leim/Makefile.in
index eb81e1b2add..d0e77e2f0fb 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -77,7 +77,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
@@ -110,7 +110,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" > $@
 
@@ -127,24 +127,24 @@ ${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 [ "`cd ${srcdir} && /bin/pwd`" = "`/bin/pwd`" ] ; then \
-	  ${RUN_EMACS} -l "${buildlisppath}/international/quail" \
+	  ${RUN_EMACS} -l international/quail \
 	    --eval "(update-leim-list-file \".\")" ; \
 	else \
-	  ${RUN_EMACS} -l "${buildlisppath}/international/quail" \
+	  ${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 "$(buildlisppath)/international/ja-dic-cnv" \
+	$(RUN_EMACS) -batch -l ja-dic-cnv \
 	  -f batch-skkdic-convert -dir "$(srcdir)/ja-dic" \
 	  "$(srcdir)/SKK-DIC/SKK-JISYO.L"
 
@@ -196,5 +196,5 @@ extraclean: maintainer-clean
 .PHONY: check-declare
 
 check-declare:
-	$(RUN_EMACS) -l "$(buildlisppath)/emacs-lisp/check-declare" \
+	$(RUN_EMACS) -l check-declare \
 	  --eval '(check-declare-directory (unmsys--file-name "$(srcdir)"))'
-- 
2.39.2