From 33d85d5d7aa5809e2ebb5a20568bde7c30932627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= Date: Tue, 24 Nov 2020 14:27:13 +0100 Subject: [PATCH] Makefile: Remove GITDIR --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 74f193b..aede562 100644 --- a/Makefile +++ b/Makefile @@ -119,8 +119,6 @@ UPGRADES = \ $(SED) 's/$$/--$(EXTVERSION).sql/' | \ $(SED) 's/ /--$(EXTVERSION).sql $(EXTENSION)--/g') -GITDIR=$(shell test -d .git && echo '.git' || cat .git | $(SED) 's/^gitdir: //') - DATA_built = \ $(EXTENSION)--$(EXTVERSION).sql \ $(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql \ @@ -168,7 +166,7 @@ $(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql: $(EXTENSION)--$(EXTVERSION). $(EXTENSION).control: $(EXTENSION).control.in Makefile $(SED) -e 's/@@VERSION@@/$(EXTVERSION)/g' -e 's/@@plpythonu@@/$(PLPYTHONU)/g' $< > $@ -cartodb_version.sql: cartodb_version.sql.in Makefile $(GITDIR)/index +cartodb_version.sql: cartodb_version.sql.in Makefile $(SED) -e 's/@@VERSION@@/$(EXTVERSION)/' -e 's/@extschema@/cartodb/g' -e "s/@postgisschema@/public/g" -e 's/@@plpythonu@@/$(PLPYTHONU)/g' $< > $@ # Needed for consistent `echo` results with backslashes