Changed libdir references to LIBPATH and started using the magic

$libpath entry for default installs.

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

diff --git a/Makefile b/Makefile
index 00a871fc25802faf73743369f7593775f76f53ab..8c8a1baf54c4c82ed0ff5ca6da06e3bb7f3b86b9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,11 +22,11 @@ subdir=contrib/postgis
 ifeq (${PGSQL_SRC},) 
        top_builddir = ../..
        include $(top_builddir)/src/Makefile.global
-       libdir := $$libdir
+       LPATH := $$libdir
 else
        top_builddir = ${PGSQL_SRC}
        include $(top_builddir)/src/Makefile.global
-       libdir := ${PWD}
+       LPATH := ${PWD}
 endif
 
 #---------------------------------------------------------------
@@ -104,8 +104,8 @@ loaderdumper:
 include $(top_srcdir)/src/Makefile.shlib
 
 $(NAME).sql: $(NAME).sql.in $(NAME)_gist_$(USE_VERSION).sql.in 
-       sed -e 's:@MODULE_FILENAME@:$(libdir)/$(shlib):g;s:@POSTGIS_VERSION@:$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION):g' < $(NAME).sql.in > $@ 
-       sed -e 's:@MODULE_FILENAME@:$(libdir)/$(shlib):g;s:@POSTGIS_VERSION@:$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION):g' < $(NAME)_gist_$(USE_VERSION).sql.in >> $(NAME).sql
+       sed -e 's:@MODULE_FILENAME@:$(LPATH)/$(shlib):g;s:@POSTGIS_VERSION@:$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION):g' < $(NAME).sql.in > $@ 
+       sed -e 's:@MODULE_FILENAME@:$(LPATH)/$(shlib):g;s:@POSTGIS_VERSION@:$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION):g' < $(NAME)_gist_$(USE_VERSION).sql.in >> $(NAME).sql
 
 $(NAME)_undef.sql: $(NAME).sql
        perl create_undef.pl $< > $@