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

[rails.git] / db / functions / Makefile

diff --git a/db/functions/Makefile b/db/functions/Makefile
index dac1889dc978ef49e33c4470eea335ef2bb90ea9..9388e2d2360521b5c0b673fe27e6159708fd0927 100644 (file)
--- a/db/functions/Makefile
+++ b/db/functions/Makefile
@@ -1,7 +1,8 @@
+BUNDLE ?= bundle

 PG_CONFIG ?= pg_config
 DESTDIR ?= .
 
 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)
 
 OS=$(shell uname -s)
 ifeq (${OS},Darwin)


@@ -15,7 +16,7 @@ all: ${DESTDIR}/libpgosm.so
 clean:
        $(RM) ${DESTDIR}/*.so ${DESTDIR}/*.o
 
 clean:
        $(RM) ${DESTDIR}/*.so ${DESTDIR}/*.o
 

-${DESTDIR}/libpgosm.so: ${DESTDIR}/quadtile.o ${DESTDIR}/maptile.o ${DESTDIR}/xid_to_int4.o
+${DESTDIR}/libpgosm.so: ${DESTDIR}/quadtile.o

        cc ${LDFLAGS} -o $@ $^
 
 ${DESTDIR}/%.o: %.c
        cc ${LDFLAGS} -o $@ $^
 
 ${DESTDIR}/%.o: %.c