11 files changed, 42 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 9e590af..4c5a4b9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,6 @@
 [submodule "src/configs/GNU_Bison"]
 	path = src/configs/GNU_Bison
 	url = https://github.com/lshprung/gnu-bison-dash-docset.git
+[submodule "src/configs/GNU_Automake"]
+	path = src/configs/GNU_Automake
+	url = https://github.com/lshprung/gnu-automake-dash-docset.git
diff --git a/Makefile b/Makefile
index 2ec926e..f9956ac 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,7 @@ debmake \
 Flex \
 GNU_Autoconf \
 GNU_Autoconf_Archive \
+GNU_Automake \
 GNU_Bash \
 GNU_Bison \
 GNU_Make
@@ -36,4 +37,4 @@ $(SUPPORTED_TARGETS):
 	$(SRC_MAKE_CALL) DOCSET_NAME=$@
 
 $(BUILD_DIR)/%.tgz: $(BUILD_DIR)/%.docset
-	tar --exclude='.DS_Store' -czf $@ $(basename $@).docset
+	tar --exclude='.DS_Store' -czf $@ -C $(BUILD_DIR) $(notdir $(basename $@).docset)
diff --git a/README.md b/README.md
index 882d639..66c9d34 100644
--- a/README.md
+++ b/README.md
@@ -34,6 +34,7 @@ This table shows which supported docsets support which options. All targets supp
 |[flex](https://github.com/westes/flex)                |      |      |✓      |
 |[GNU_Autoconf](https://www.gnu.org/software/autoconf/)|      |      |✓      |
 |[GNU_Autoconf_Archive](https://www.gnu.org/software/autoconf-archive/)|||✓|
+|[GNU_Automake](https://www.gnu.org/software/automake/)|      |      |       |
 |[GNU_Bash](https://www.gnu.org/software/bash/)        |      |      |       |
 |[GNU_Bison](https://www.gnu.org/software/bison/)      |      |      |       |
 |[GNU_Make](http://www.gnu.org/software/make/)         |      |✓     |       |
@@ -48,6 +49,7 @@ This table shows the dependencies for each supported docset. Additionally, all d
 |[flex](https://github.com/westes/flex)                                |✓| |✓|✓|
 |[GNU_Autoconf](https://www.gnu.org/software/autoconf/)                |✓| |✓| |
 |[GNU_Autoconf_Archive](https://www.gnu.org/software/autoconf-archive/)|✓| |✓|✓|
+|[GNU_Automake](https://www.gnu.org/software/automake/)                |✓| |✓| | 
 |[GNU_Bash](https://www.gnu.org/software/bash/)                        |✓| |✓| | 
 |[GNU_Bison](https://www.gnu.org/software/bison/)                      |✓| |✓| |
 |[GNU_Make](http://www.gnu.org/software/make/)                         |✓| |✓| |
diff --git a/src/configs/Flex b/src/configs/Flex
-Subproject aa014d9c128cbc95ca5d6c0522cd3704629a1f1
+Subproject 8e6c8bb61ddb5c90657060be95168f9bc63a857
diff --git a/src/configs/GNU_Autoconf b/src/configs/GNU_Autoconf
-Subproject 4c38556bbdf06eaa318fc61117a87c5ea9136ff
+Subproject 3d2ab8b331227610eea27fefe21f7680bce3c23
diff --git a/src/configs/GNU_Automake b/src/configs/GNU_Automake
new file mode 160000
+Subproject 9b0d30029aa6880cdb2bf2ec045524108a684e0
diff --git a/src/configs/GNU_Bash b/src/configs/GNU_Bash
-Subproject 8fdfbacc6fbf173139b64a0bfa20c94903ad939
+Subproject 870f03bf346e24901b9b85057c77c8e3dd2d243
diff --git a/src/configs/GNU_Bison b/src/configs/GNU_Bison
-Subproject 9db591c61e15cf1c6e3c99a7dfbb17efe2bef5b
+Subproject e3665a5e562206c5d91e4c584cec888bfb2b76b
diff --git a/src/configs/GNU_Make b/src/configs/GNU_Make
-Subproject 54f17b5d0468c0b470a3b7576bcd9b81306ef25
+Subproject ccdaa2e36aad155447bff51d21ea67daa6c4044
diff --git a/src/scripts/gnu/index-terms-class.sh b/src/scripts/gnu/index-terms-class.sh
new file mode 100755
index 0000000..dc14178
--- /dev/null
+++ b/src/scripts/gnu/index-terms-class.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env sh
+
+# shellcheck source=../create_table.sh
+. "$(dirname "$0")"/../create_table.sh
+# shellcheck source=../insert.sh
+. "$(dirname "$0")"/../insert.sh
+
+TYPE="$1"
+shift
+INDEX_ENTRY_CLASS="$1"
+shift
+DB_PATH="$1"
+shift
+
+insert_index_terms() {
+	# Get each term from an index page and insert
+	while [ -n "$1" ]; do
+		grep -Eo "class=${INDEX_ENTRY_CLASS}.*<a href.*</a>" "$1" | while read -r line; do
+			insert_term "$line"
+		done
+
+		shift
+	done
+}
+
+insert_term() {
+	LINK="$1"
+	NAME="$(echo "$LINK" | pup -p 'a text{}' | sed 's/"/\"\"/g' | tr -d \\n)"
+	PAGE_PATH="$(echo "$LINK" | pup -p 'a attr{href}')"
+
+	insert "$DB_PATH" "$NAME" "$TYPE" "$PAGE_PATH"
+}
+
+create_table "$DB_PATH"
+insert_index_terms "$@"
diff --git a/src/scripts/gnu/index-terms.sh b/src/scripts/gnu/index-terms-colon.sh
index e82aff2..e82aff2 100755
--- a/src/scripts/gnu/index-terms.sh
+++ b/src/scripts/gnu/index-terms-colon.sh