From 30ac9af1f98d159bb2fe609b9de86180de47492c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= Date: Thu, 19 Dec 2019 17:41:40 +0100 Subject: [PATCH] Continue with the tweaking --- src/pg/Makefile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/pg/Makefile b/src/pg/Makefile index a69b78a..c6fcff5 100644 --- a/src/pg/Makefile +++ b/src/pg/Makefile @@ -14,8 +14,7 @@ DATA = \ $(EXTENSION)--dev.sql \ $(EXTENSION)--current--dev.sql \ $(EXTENSION)--dev--current.sql \ - $(EXTENSION)--$(RELEASE_VERSION)--dev.sql \ - $(EXTENSION).control + $(EXTENSION)--$(RELEASE_VERSION)--dev.sql SOURCES_DATA_DIR = sql SOURCES_DATA = $(wildcard $(SOURCES_DATA_DIR)/*.sql) @@ -25,6 +24,12 @@ ifneq ($(PYTHON3), true) REPLACEMENTS = -e 's/@@VERSION@@/$(EXTVERSION)/g' -e 's/plpython3u/plpythonu/g' endif +.PHONY: $(EXTENSION).control +$(EXTENSION).control: + $(eval TMPFILE := $(shell mktemp /tmp/$@.XXXXXXXXXX)) + $(SED) $(REPLACEMENTS) $@ > $(TMPFILE) + mv $(TMPFILE) $@ + $(DATA): $(SOURCES_DATA) $(SED) $(REPLACEMENTS) $(SOURCES_DATA_DIR)/*.sql > $@ ifneq ($(PG_PARALLEL), true) @@ -46,13 +51,14 @@ PGXS := $(shell $(PG_CONFIG) --pgxs) include $(PGXS) # This seems to be needed at least for PG 9.3.11 -all: $(DATA) +all: $(DATA) $(EXTENSION).control test: export PGUSER=postgres test: installcheck # Release tasks -.PHONY ../../release/$(EXTENSION).control: $(EXTENSION).control +.PHONY: ../../release/$(EXTENSION).control +../../release/$(EXTENSION).control: $(EXTENSION).control cp $< $@ # Prepare new release from the currently installed development version,