diff --git a/Makefile.pre.in b/Makefile.pre.in
index 3da663762972ad..4145634c032d54 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1555,7 +1555,7 @@ autoconf:
 tags::
 	cd $(srcdir); \
 	ctags -w Include/*.h; \
-	for i in $(SRCDIRS); do ctags -w -a $$i/*.[ch]; \
+	for i in $(SRCDIRS); do ctags -f tags -w -a $$i/*.[ch]; \
 	done; \
 	LC_ALL=C sort -o tags tags
 
diff --git a/configure b/configure
index 67cd4f4fa37f29..ece8caba0ef02e 100755
--- a/configure
+++ b/configure
@@ -16320,7 +16320,7 @@ do
 done
 
 
-SRCDIRS="Parser Grammar Objects Python Modules Mac Programs"
+SRCDIRS="Parser Objects Python Modules Programs"
 { $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 6e78bb64d7e951..b9fa3c4bdf624c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5200,7 +5200,7 @@ do
 done
 
 AC_SUBST(SRCDIRS)
-SRCDIRS="Parser Grammar Objects Python Modules Mac Programs"
+SRCDIRS="Parser Objects Python Modules Programs"
 AC_MSG_CHECKING(for build directories)
 for dir in $SRCDIRS; do
     if test ! -d $dir; then