Description: Correct Makefile for vpath builds
Author: Markus Wanner <markus@bluegap.ch>
Forwarded: no
Last-Update: 2014-07-06

--- a/Makefile
+++ b/Makefile
@@ -4,24 +4,30 @@
 
 DATA         = $(filter-out $(wildcard sql/*--*.sql),$(wildcard sql/*.sql))
 
-DOCS         = $(wildcard doc/*.md)
+DOCS         = $(wildcard $(VPATH)/doc/*.md)
 
 EXTENSION    = multicorn
-EXTVERSION   = $(shell grep default_version $(EXTENSION).control | sed -e "s/default_version[[:space:]]*=[[:space:]]*'\([^']*\)'/\1/")
+EXTVERSION   = $(shell grep default_version $(VPATH)/$(EXTENSION).control | sed -e "s/default_version[[:space:]]*=[[:space:]]*'\([^']*\)'/\1/")
 
 all: preflight-check sql/$(EXTENSION)--$(EXTVERSION).sql
 
+directories.stamp:
+	[ -d sql ] || mkdir sql
+	[ -d src ] || mkdir src
+	touch $@
+
+$(OBJS): directories.stamp
+
 install: python_code 
 
-sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
+sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql directories.stamp
 	cp $< $@
 
 preflight-check:
-	./preflight-check.sh
-
+	$(srcdir)/preflight-check.sh
 
 python_code: setup.py
-	cp ./setup.py ./setup--$(EXTVERSION).py
+	cp $(VPATH)/setup.py ./setup--$(EXTVERSION).py
 	sed -i -e "s/__VERSION__/$(EXTVERSION)-dev/g" ./setup--$(EXTVERSION).py
 	$(PYTHON) ./setup--$(EXTVERSION).py install
 	rm ./setup--$(EXTVERSION).py