From: Paul Ramsey <pramsey@cleverelephant.ca>
Date: Thu, 26 Jul 2001 17:41:03 +0000 (+0000)
Subject: And one last time, this time for real, fixing the install location.
X-Git-Tag: pgis_0_6_0~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=92cd0fa5e76b22ca678a984805ce4fa698615eb3;p=postgis

And one last time, this time for real, fixing the install location.


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

diff --git a/Makefile b/Makefile
index 296e75a91..1727896b9 100644
--- a/Makefile
+++ b/Makefile
@@ -6,14 +6,14 @@ subdir = contrib/postgis
 # Root of the pgsql source tree 
 ifeq (${PGSQL_SRC},) 
 	top_builddir = ../..
-	libdir = $(libdir)/contrib
+	include $(top_builddir)/src/Makefile.global
+	libdir := $(libdir)/contrib
 else
 	top_builddir = ${PGSQL_SRC}
-	libdir = ${PWD}
+	include $(top_builddir)/src/Makefile.global
+	libdir := ${PWD}
 endif
 
-include $(top_builddir)/src/Makefile.global
-
 test_db = geom_regress
 
 # shared library parameters