From 0df097b7e262fe6a07263ba0a970aa8ab80f5ee5 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Sun, 1 Dec 2019 23:23:02 -0800
Subject: [PATCH] Fix some issues with tags generation.

---
 src/compiler/Tags.sh  | 11 ++---------
 src/libraries/Tags.sh | 29 +++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 9 deletions(-)
 create mode 100755 src/libraries/Tags.sh

diff --git a/src/compiler/Tags.sh b/src/compiler/Tags.sh
index ca17fb4d0..41a80b129 100755
--- a/src/compiler/Tags.sh
+++ b/src/compiler/Tags.sh
@@ -26,13 +26,6 @@
 # Utility to make TAGS file for the MIT/GNU Scheme compiler directory.
 # The working directory must be the compiler directory.
 
-set -e
-
-if [[ -d machine ]]; then
-    MACHINES=(machine/*.scm machine/*.pkg)
-else
-    MACHINES=(machines/*/*.scm machines/*/*.pkg)
-fi
-
 etags back/*.scm base/*.scm fggen/*.scm fgopt/*.scm \
-      rtlbase/*.scm rtlgen/*.scm rtlopt/*.scm "${MACHINES[@]}"
+      rtlbase/*.scm rtlgen/*.scm rtlopt/*.scm \
+      machines/*/*.scm machines/*/*.pkg
diff --git a/src/libraries/Tags.sh b/src/libraries/Tags.sh
new file mode 100755
index 000000000..669d8c98e
--- /dev/null
+++ b/src/libraries/Tags.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+#
+# Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
+#     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+#     2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
+#     2015, 2016, 2017, 2018, 2019 Massachusetts Institute of
+#     Technology
+#
+# This file is part of MIT/GNU Scheme.
+#
+# MIT/GNU Scheme is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# MIT/GNU Scheme is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with MIT/GNU Scheme; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+# Utility to make TAGS file for an MIT/GNU Scheme build directory.
+# The working directory must be the build directory.
+
+etags *.scm
-- 
2.25.1