Merge branch 'pull/3692'

[rails.git] / db / functions / Makefile

diff --git a/db/functions/Makefile b/db/functions/Makefile
index 71169b2b7cb0967d668b9b4ba2c488d1c1433f1e..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,8 +16,8 @@ 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
-       cc ${LDFLAGS} -o $@ $<
+${DESTDIR}/libpgosm.so: ${DESTDIR}/quadtile.o
+       cc ${LDFLAGS} -o $@ $^

 
 ${DESTDIR}/%.o: %.c
        cc -I `${PG_CONFIG} --includedir` -I `${PG_CONFIG} --includedir-server` -I${QTDIR} -fPIC -O3 -DUSE_PGSQL -c -o $@ $<
 
 ${DESTDIR}/%.o: %.c
        cc -I `${PG_CONFIG} --includedir` -I `${PG_CONFIG} --includedir-server` -I${QTDIR} -fPIC -O3 -DUSE_PGSQL -c -o $@ $<