Add autotools docker Makefile

This way, we can run an autotools build in any of the images.

Author: d-torrance

M2/BUILD/docker/autotools/Makefile

@@ -0,0 +1,18 @@
+# include this Makefile in other docker Makefiles to add a
+# 'build-autotools' target for running the entire autotools build
+
+define M2_BUILD_SCRIPT_autotools
+set -xe
+
+git config --global --add safe.directory $(M2_HOME)/M2
+mkdir -p M2/$(BUILD_DIR)
+cd M2/$(BUILD_DIR)
+$(M2_HOME)/M2/M2/autogen.sh
+$(M2_HOME)/M2/M2/configure $(CONFIG_OPT)
+make
+endef
+export M2_BUILD_SCRIPT_autotools
+
+build-autotools: build-image
+	docker run $(VOLUME) -it --entrypoint="" $(TAG) \
+		bash -c "$$M2_BUILD_SCRIPT_autotools"

M2/BUILD/docker/fedora/Makefile

@@ -1,4 +1,5 @@
 include ../ubuntu/Makefile
+include ../autotools/Makefile
 
 ## Parameters
 RELEASE = latest
@@ -11,22 +12,4 @@ rpm:;       docker run $(VOLUME) -it --entrypoint "" $(TAG) bash -c "cd M2/$(BUI
 
 rpmlint:;   docker run $(VOLUME) -it --entrypoint "" $(TAG) bash -c "rpmlint M2/$(BUILD_DIR)/Macaulay2-*.rpm"
 
-## autotools build
-## TODO: generalize this to other distros, move to toplevel Makefile
-
 CONFIG_OPT = --with-system-libs --enable-download --enable-rpm --prefix=/usr
-
-define M2_BUILD_SCRIPT_autotools
-set -xe
-
-mkdir -p M2/$(BUILD_DIR)
-cd M2/$(BUILD_DIR)
-$(M2_HOME)/M2/M2/autogen.sh
-$(M2_HOME)/M2/M2/configure $(CONFIG_OPT)
-make
-endef
-export M2_BUILD_SCRIPT_autotools
-
-build-autotools: build-image
-	docker run $(VOLUME) -it --entrypoint="" $(TAG) \
-		bash -c "$$M2_BUILD_SCRIPT_autotools"

M2/BUILD/docker/rhel/Makefile

@@ -1,4 +1,5 @@
 include ../Makefile
+include ../autotools/Makefile
 
 ## Parameters
 DISTRIBUTION = rockylinux
@@ -9,23 +10,4 @@ BUILD_ARGS = --build-arg DISTRIBUTION=$(DISTRIBUTION) \
 TAG = m2-$(BUILD)-$(DISTRIBUTION)-$(RELEASE)-build
 BUILD_DIR = M2/BUILD/build-docker
 
-## Script for building Macaulay2 (autotools)
-define M2_BUILD_SCRIPT_autotools
-set -xe
-
-git config --global --add safe.directory $(M2_HOME)/M2
-mkdir -p M2/$(BUILD_DIR)
-cd M2/$(BUILD_DIR)
-$(M2_HOME)/M2/M2/autogen.sh
-$(M2_HOME)/M2/M2/configure --with-system-gc --enable-download --enable-rpm \
-	--prefix=/usr
-make
-endef
-export M2_BUILD_SCRIPT_autotools
-
-###############################################################################
-# Build targets
-
-build: build-image
-	docker run $(VOLUME) -it --entrypoint="" $(TAG) \
-		bash -c "$$M2_BUILD_SCRIPT_$(BUILD)"
+CONFIG_OPT = --with-system-gc --enable-download --enable-rpm --prefix=/usr