]> granicus.if.org Git - postgis/commitdiff
Change PGSQL_SRC behavior back to developer-friendly.
authorPaul Ramsey <pramsey@cleverelephant.ca>
Wed, 28 Apr 2004 23:07:44 +0000 (23:07 +0000)
committerPaul Ramsey <pramsey@cleverelephant.ca>
Wed, 28 Apr 2004 23:07:44 +0000 (23:07 +0000)
git-svn-id: http://svn.osgeo.org/postgis/trunk@533 b70326c6-7e19-0410-871a-916f4a2858ee

Makefile

index ac6aec209baa1174baf1c18ba4cfe099252493d4..72ab398461ac10b766a414fd04e98097d2411411 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -36,11 +36,11 @@ subdir=contrib/postgis
 ifeq (${PGSQL_SRC},) 
        top_builddir = ../..
        include $(top_builddir)/src/Makefile.global
-       #LPATH := $$libdir
+       LPATH := \$$libdir
 else
        top_builddir = ${PGSQL_SRC}
        include $(top_builddir)/src/Makefile.global
-       #LPATH := ${PWD}
+       LPATH := ${PWD}
 endif
 
 #---------------------------------------------------------------
@@ -79,10 +79,10 @@ NAME=postgis
 SO_MAJOR_VERSION=0
 SO_MINOR_VERSION=8
 ifeq (${USE_VERSION}, 71) 
-       MODULE_FILENAME = $(libdir)/$(shlib)
+       MODULE_FILENAME = $(LPATH)/$(shlib)
        MODULE_INSTALLDIR = $(libdir)
 else
-       MODULE_FILENAME = \$$libdir/$(shlib)
+       MODULE_FILENAME = $(LPATH)/$(shlib)
        MODULE_INSTALLDIR = $(pkglibdir)
 endif