From a24e2e8ac6843d08eb4d370aa8298b07070ac8b5 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Tue, 21 Jan 2025 14:27:38 -0600 Subject: [PATCH] Use correct dependencies when files are generated --- make_files/make_cluster.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/make_files/make_cluster.mk b/make_files/make_cluster.mk index 76b328f..31b51ca 100644 --- a/make_files/make_cluster.mk +++ b/make_files/make_cluster.mk @@ -239,7 +239,7 @@ create-adminuser: $(PSQL_DEPENDS) ## (See the db/README.) The ADMINUSER is used to ## create the new roles. .PHONY: create-groups -create-groups: db/creategroups.sql +create-groups: db/creategroups.sql $(GENERIC_DEPENDS) cat db/creategroups.sql \ | psql $(PSQL_ARGS) $(PSQL_SINGLE_TRANS) --set=ON_ERROR_STOP=y @@ -254,7 +254,7 @@ create-groups: db/creategroups.sql ## an unusual state. .PHONY: init-database -init-database: $(GENERATED_SHELL) $(PSQL_DEPENDS) +init-database: $(GENERATED_SHELL) $(PSQL_DEPENDS) $(GENERIC_DEPENDS) [ -n "$(TARGET_DB)" ] \ || { printf 'The TARGET_DB variable must be set\n' >&2 ; \ exit 1 ; } @@ -434,13 +434,13 @@ set-isolation: $(PSQL_DEPENDS) ## set-timezone Set the default TimeZone in the database named ## by the TARGET_DB variable. .PHONY: set-timezone -set-timezone: $(PSQL_DEPENDS) db/set_timezone.sh +set-timezone: $(PSQL_DEPENDS) db/set_timezone.sh $(GENERIC_DEPENDS) ( $(PSQL_SETUP) \ db/set_timezone.sh ; \ ) \ | psql $(PSQL_ARGS) $(PSQL_SINGLE_TRANS) --set=ON_ERROR_STOP=y # The generated shell scripts -$(GENERATED_SHELL): %.sh: %.m4 +$(GENERATED_SHELL): %.sh: %.m4 $(GENERIC_DEPENDS) m4 $(M4_DB_INCLUDE_ARGS) $< > $@ chmod a+x $@ -- 2.34.1