From: Paul Ramsey <pramsey@cleverelephant.ca>
Date: Wed, 28 Apr 2004 23:07:44 +0000 (+0000)
Subject: Change PGSQL_SRC behavior back to developer-friendly.
X-Git-Tag: pgis_0_8_2~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=757f0b6cd5689e25efa034a301f0c6f4ade27bf7;p=postgis

Change PGSQL_SRC behavior back to developer-friendly.


git-svn-id: http://svn.osgeo.org/postgis/trunk@533 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/Makefile b/Makefile
index ac6aec209..72ab39846 100644
--- 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