Installs for PG>7.1 goes to pkglibdir

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

diff --git a/Makefile b/Makefile
index 8a9a2391ef823c625356cd41cd3aeb5d25429c56..da282bc3d85c73fd3566967bd1239a10333d1451 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,13 @@ endif
 NAME=postgis
 SO_MAJOR_VERSION=0
 SO_MINOR_VERSION=8
-MODULE_FILENAME = $$libdir/../$(shlib)
+ifeq (${USE_VERSION}, 71) 
+       MODULE_FILENAME = $(libdir)/$(shlib)
+       MODULE_INSTALLDIR = $(libdir)
+else
+       MODULE_FILENAME = $$libdir/$(shlib)
+       MODULE_INSTALLDIR = $(pkglibdir)
+endif
 #---------------------------------------------------------------
 
 override CFLAGS += -g -fexceptions  
@@ -153,7 +159,7 @@ postgis.sql: postgis_sql_common.sql.in postgis_sql_$(USE_VERSION)_end.sql.in pos
 postgis_undef.sql: postgis.sql create_undef.pl
        perl create_undef.pl $< $(USE_VERSION) > $@ 
 
-install: all installdirs install-lib
+install: all installdirs install-postgis-lib
        $(INSTALL_DATA) $(srcdir)/README.postgis  $(docdir)/contrib
        $(INSTALL_DATA) postgis.sql $(datadir)/contrib
        $(INSTALL_DATA) postgis_undef.sql $(datadir)/contrib
@@ -161,6 +167,24 @@ install: all installdirs install-lib
        $(INSTALL_DATA) README.postgis $(datadir)/contrib
        $(MAKE) -C loader install
 
+#- This has been copied from postgresql and adapted
+install-postgis-lib: $(shlib)
+       $(INSTALL_SHLIB) $< $(DESTDIR)$(MODULE_INSTALLDIR)/$(shlib)
+ifneq ($(PORTNAME), win)
+ifneq ($(shlib), lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION))
+       cd $(DESTDIR)$(MODULE_INSTALLDIR) && \
+       rm -f lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) && \
+       $(LN_S) $(shlib) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
+endif
+ifneq ($(shlib), lib$(NAME)$(DLSUFFIX))
+       cd $(DESTDIR)$(MODULE_INSTALLDIR) && \
+       rm -f lib$(NAME)$(DLSUFFIX) && \
+       $(LN_S) $(shlib) lib$(NAME)$(DLSUFFIX)
+endif
+
+endif # not win
+#----------------------------------------------------------
+
 installdirs:
        $(mkinstalldirs) $(docdir)/contrib $(datadir)/contrib $(libdir)