Fix "make tags" command (#1337)

Backport enhancements from master, commits:

* 9c4bfa6669e220efdd379b9f8e7db32bb4e25e72: "make tags": remove -t
  option of ctags. The option was kept for backward compatibility,
  but it was completly removed recently. Patch written by Stéphane
  Wirtel.
* cf0ac6a71ae51249a05521f49c1a0fabbb948488: Fix "make tags": set
  locale to C to call sort
* 8a543c0bc7347d5b333f334d157bf4a7cd33c14a: `make tags` fixes (GH-717)

diff --git a/Makefile.pre.in b/Makefile.pre.in
index e28896406f6fcf48c86c8b9acd6db4370c1eda68..2b054684c63372a1d26f3204bdf8dd16677bfde4 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1365,10 +1365,10 @@ autoconf:
 # Create a tags file for vi
 tags::
        cd $(srcdir); \
-       ctags -w -t Include/*.h; \
-       for i in $(SRCDIRS); do ctags -w -t -a $$i/*.[ch]; \
+       ctags -w Include/*.h; \
+       for i in $(SRCDIRS); do ctags -f tags -w -a $$i/*.[ch]; \
        done; \
-       sort -o tags tags
+       LC_ALL=C sort -o tags tags
 
 # Create a tags file for GNU Emacs
 TAGS::

diff --git a/configure b/configure
index 40549d0299d72bacaf1fd5472c73c0ed1095d8ad..35fbeacbe547adea0c808e5045eb99ed4c90dff3 100755 (executable)
--- a/configure
+++ b/configure
@@ -15028,7 +15028,7 @@ do
 done
 
 
-SRCDIRS="Parser Grammar Objects Python Modules Mac"
+SRCDIRS="Parser Objects Python Modules"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for build directories" >&5
 $as_echo_n "checking for build directories... " >&6; }
 for dir in $SRCDIRS; do

diff --git a/configure.ac b/configure.ac
index 5bd9b9d412899d1f21355efd7a249e2fd7acc8eb..75a62d2d9b23077ec7526151d600cf6e43c2ddef 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4729,7 +4729,7 @@ do
 done
 
 AC_SUBST(SRCDIRS)
-SRCDIRS="Parser Grammar Objects Python Modules Mac"
+SRCDIRS="Parser Objects Python Modules"
 AC_MSG_CHECKING(for build directories)
 for dir in $SRCDIRS; do
     if test ! -d $dir; then