aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorEli Zaretskii2013-06-07 12:26:02 +0300
committerEli Zaretskii2013-06-07 12:26:02 +0300
commita822acffe2a370ed1726db92aad64b5287582a73 (patch)
tree03b1cd18c24bba9b30bdaa00a709f076d5f31319 /lisp
parent3649ba053bc957fdea95d3ffea3b3fc8bd96acdc (diff)
downloademacs-a822acffe2a370ed1726db92aad64b5287582a73.tar.gz
emacs-a822acffe2a370ed1726db92aad64b5287582a73.zip
Fix "make TAGS" on MS-Windows.
lisp/Makefile.in (TAGS TAGS-LISP): Pass the (long) list of *.el files through xargs, to avoid failure due to MS-Windows limitations on command-line length. src/Makefile.in (ctagsfiles1, ctagsfiles2): Don't include *.m files. (ctagsfiles3): New variable, includes only *.m files. (TAGS): Use an explicit language name in the regular expressions, to avoid transformation of '/SOMETHING' by MSYS to 'c:\MSYS\SOMETHING'.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/Makefile.in5
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 898bf2615fa..50e4647b438 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12013-06-07 Eli Zaretskii <eliz@gnu.org>
2
3 * Makefile.in (TAGS TAGS-LISP): Pass the (long) list of *.el files
4 through xargs, to avoid failure due to MS-Windows limitations on
5 command-line length.
6
12013-06-06 Glenn Morris <rgm@gnu.org> 72013-06-06 Glenn Morris <rgm@gnu.org>
2 8
3 * font-lock.el (lisp-font-lock-keywords-2): 9 * font-lock.el (lisp-font-lock-keywords-2):
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 4884213daeb..61449b66c9b 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -209,8 +209,9 @@ update-authors:
209 $(emacs) -l authors -f batch-update-authors $(top_srcdir)/etc/AUTHORS $(top_srcdir) 209 $(emacs) -l authors -f batch-update-authors $(top_srcdir)/etc/AUTHORS $(top_srcdir)
210 210
211TAGS TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptagsfiles4) 211TAGS TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptagsfiles4)
212 els=`echo $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptagsfiles4) | sed -e "s,$(lisp)/[^ ]*loaddefs[^ ]*,," -e "s,$(lisp)/ldefs-boot[^ ]*,,"`; \ 212 rm -f $@; touch $@; \
213 ${ETAGS} -o $@ $$els 213 echo $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptagsfiles4) | sed -e "s,$(lisp)/[^ ]*loaddefs[^ ]*,," -e "s,$(lisp)/ldefs-boot[^ ]*,," | \
214 xargs $(XARGS_LIMIT) ${ETAGS} -a -o $@
214 215
215# The src/Makefile.in has its own set of dependencies and when they decide 216# The src/Makefile.in has its own set of dependencies and when they decide
216# that one Lisp file needs to be re-compiled, we had better recompile it as 217# that one Lisp file needs to be re-compiled, we had better recompile it as