From 85afef40d80da9d3457b741daba2b0bb178a6e7f Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Fri, 6 Jun 2014 16:13:47 +0200 Subject: [PATCH] Make git dependency support use as a submodule --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5b47851..dd5f731 100644 --- a/Makefile +++ b/Makefile @@ -27,6 +27,7 @@ UPGRADES = \ $(SED) 's/ /--$(EXTVERSION).sql $(EXTENSION)--/g') REV=$(shell git describe) +GITDIR=$(shell test -d .git && echo '.git' || cat .git | $(SED) 's/^gitdir: //') DATA_built = \ $(EXTENSION)--$(EXTVERSION).sql \ @@ -66,7 +67,7 @@ $(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql: $(EXTENSION)--$(EXTVERSION). $(EXTENSION).control: $(EXTENSION).control.in Makefile $(SED) -e 's/@@VERSION@@/$(EXTVERSION)/' $< > $@ -cartodb_version.sql: cartodb_version.sql.in Makefile .git/index +cartodb_version.sql: cartodb_version.sql.in Makefile $(GITDIR)/index $(SED) -e 's/@@VERSION@@/$(EXTVERSION) $(REV)/' $< > $@ legacy_regress: $(REGRESS_OLD) Makefile