From faf1012ee4dd884aa6af7b25aa932233d4b1f36a Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Thu, 9 Nov 2023 10:24:25 -0600 Subject: [PATCH] Make "old" the default db for converting --- conversion/Makefile | 5 +++++ make_files/defaults.mk | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/conversion/Makefile b/conversion/Makefile index d977e9e..dd9ea7c 100644 --- a/conversion/Makefile +++ b/conversion/Makefile @@ -34,6 +34,11 @@ GENERIC_DEPENDS := Makefile \ # Make "help" be the default target include $(MAKE_FILES)/help.mk +# Override variable defaults +ifeq ($(strip $(TARGET_DB)),) + export TARGET_DB := old +endif + # Defaults for variable values # Have a look as you'll probably want to set some of them. include $(MAKE_FILES)/defaults.mk diff --git a/make_files/defaults.mk b/make_files/defaults.mk index 778260b..2421530 100644 --- a/make_files/defaults.mk +++ b/make_files/defaults.mk @@ -27,7 +27,8 @@ ## ## TARGET_DB ## The name of the database with which to interact. The default -## is 'sokwedb_dev'. +## is 'sokwedb_dev'. The exception is when run from conversion/, +## in which case the default is 'old'. ## ## ADMINUSER ## The PostgreSQL role used to connect to the database. This must -- 2.34.1