summaryrefslogtreecommitdiff
path: root/leim
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2010-03-27 15:01:22 +0300
committerEli Zaretskii <eliz@gnu.org>2010-03-27 15:01:22 +0300
commit31f191b3a2d314c41a1e48b51615fdfe3fe20260 (patch)
tree7e3995788e870f8a22e2dcbf3b698ea40e2063fd /leim
parent2201e7e2be76f3b03746d530059c8544a26a1036 (diff)
downloademacs-31f191b3a2d314c41a1e48b51615fdfe3fe20260.tar.gz
Enclose the argument of "-l" in quotes.
makefile.w32-in ($(TIT), $(MISC_DIC), leim-list.el): Enclose the argument of "-l" in $(ARGQUOTE), in case it includes blanks or other special characters.
Diffstat (limited to 'leim')
-rw-r--r--leim/ChangeLog6
-rw-r--r--leim/makefile.w32-in15
2 files changed, 16 insertions, 5 deletions
diff --git a/leim/ChangeLog b/leim/ChangeLog
index 6ea68248238..9dd41d3bafa 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-27 Eli Zaretskii <eliz@gnu.org>
+
+ * makefile.w32-in ($(TIT), $(MISC_DIC), leim-list.el): Enclose the
+ argument of "-l" in $(ARGQUOTE), in case it includes blanks or
+ other special characters.
+
2010-03-18 Glenn Morris <rgm@gnu.org>
* Makefile.in (maintainer-clean): Use bootstrap-clean.
diff --git a/leim/makefile.w32-in b/leim/makefile.w32-in
index c36e98af618..dbebc32602c 100644
--- a/leim/makefile.w32-in
+++ b/leim/makefile.w32-in
@@ -170,17 +170,21 @@ $(SUBDIRS):
# WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as
# this can break with GNU Make 3.81 and later if sh.exe is used.
$(TIT):
- $(RUN_EMACS) -l $(buildlisppath)/international/titdic-cnv \
+ $(RUN_EMACS) -l \
+ $(ARGQUOTE)$(buildlisppath)/international/titdic-cnv$(ARGQUOTE) \
--eval $(ARGQUOTE)(batch-titdic-convert t)$(ARGQUOTE) \
-dir quail $(srcdir)/CXTERM-DIC
- $(RUN_EMACS) -l $(buildlisppath)/international/quail \
+ $(RUN_EMACS) -l \
+ $(ARGQUOTE)$(buildlisppath)/international/quail$(ARGQUOTE) \
-f batch-byte-compile $(TIT:.elc=.el)
# Rule to generate quail/*.el from MISC_DIC/*.tit.
$(MISC_DIC):
- $(RUN_EMACS) -l $(buildlisppath)/international/titdic-cnv \
+ $(RUN_EMACS) -l \
+ $(ARGQUOTE)$(buildlisppath)/international/titdic-cnv$(ARGQUOTE) \
-f batch-miscdic-convert -dir quail $(srcdir)/MISC-DIC
- $(RUN_EMACS) -l $(buildlisppath)/international/quail \
+ $(RUN_EMACS) -l \
+ $(ARGQUOTE)$(buildlisppath)/international/quail$(ARGQUOTE) \
-f batch-byte-compile $(MISC_DIC:.elc=.el)
#
@@ -188,7 +192,8 @@ $(MISC_DIC):
# this can break with GNU Make 3.81 and later if sh.exe is used.
leim-list.el: $(SUBDIRS) $(WORLD) $(srcdir)/leim-ext.el
- $(DEL) leim-list.el
- $(RUN_EMACS) -l $(buildlisppath)/international/quail \
+ $(RUN_EMACS) -l \
+ $(ARGQUOTE)$(buildlisppath)/international/quail$(ARGQUOTE) \
--eval $(ARGQUOTE)(update-leim-list-file $(DQUOTE).$(DQUOTE))$(ARGQUOTE)
$(RUN_EMACS) --eval $(ARGQUOTE)(w32-append-code-lines $(DQUOTE)$@$(DQUOTE) $(DQUOTE)$(srcdir)/leim-ext.el$(DQUOTE))$(ARGQUOTE)