From: Sandro Santilli <strk@keybit.net>
Date: Thu, 20 Nov 2003 17:51:43 +0000 (+0000)
Subject: Installs for PG>7.1 goes to pkglibdir
X-Git-Tag: pgis_0_8_0~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=24b0f06cc17ddf61d7815f0ecabd7668042c43aa;p=postgis

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 8a9a2391e..da282bc3d 100644
--- 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)