Merge remote-tracking branch 'upstream/pull/2431'

[rails.git] / db / functions / Makefile

diff --git a/db/functions/Makefile b/db/functions/Makefile
index dac1889dc978ef49e33c4470eea335ef2bb90ea9..a1259fc5556888be42cc04279fd29a0047e7abb4 100644 (file)
--- a/db/functions/Makefile
+++ b/db/functions/Makefile
@@ -1,7 +1,8 @@
+BUNDLE ?= bundle
 PG_CONFIG ?= pg_config
 DESTDIR ?= .
 
-QTDIR=../../lib/quad_tile
+QTDIR=$(shell ${BUNDLE} show quad_tile | tail -n 1)/ext/quad_tile
 
 OS=$(shell uname -s)
 ifeq (${OS},Darwin)