From 7864b517e574d5e567bd8d74eb9a906f2ce58ed4 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Wed, 8 Sep 2021 11:59:01 +0000 Subject: [PATCH] converting docker/Makefile to docker/Makefile.am --- codepot/configure.ac | 5 ++++- codepot/docker/{Makefile => Makefile.am} | 8 ++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) rename codepot/docker/{Makefile => Makefile.am} (66%) diff --git a/codepot/configure.ac b/codepot/configure.ac index c7cb60b7..c9c0bba0 100644 --- a/codepot/configure.ac +++ b/codepot/configure.ac @@ -118,6 +118,10 @@ AC_CONFIG_FILES([ DEBIAN/control DEBIAN/postinst DEBIAN/postrm + + docker/Makefile + + src/Makefile src/config.php src/codepot/config/Makefile src/codepot/controllers/Makefile @@ -163,7 +167,6 @@ AC_CONFIG_FILES([ src/system/database/Makefile src/system/Makefile - src/Makefile ]) AC_OUTPUT diff --git a/codepot/docker/Makefile b/codepot/docker/Makefile.am similarity index 66% rename from codepot/docker/Makefile rename to codepot/docker/Makefile.am index 4e611a88..bfdc9ef6 100644 --- a/codepot/docker/Makefile +++ b/codepot/docker/Makefile.am @@ -2,8 +2,12 @@ all: @echo "Choose one of the following targets:" @echo " rocky84 ubnt2004" -ubnt2004: +ubnt2004: codepot-$(VERSION): docker build -t codepot:ubnt20.04 -f Dockerfile.ubnt2004 . -rocky84: +rocky84: codepot-$(VERSION): docker build -t codepot:rocky8.4 -f Dockerfile.rocky84 . + +codepot-$(VERSION): + cd .. && make dist +