Cleaned up to use more facilities from Makefile.shlib

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

diff --git a/Makefile.config.in b/Makefile.config.in
index b7191123d1ce401facda28555771aabb5cee312b..7035fef7b6a7a9cc5b276e526fb04702ed02b0f2 100644 (file)
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -98,6 +98,7 @@ INSTALL=@INSTALL@ -c
 INSTALL_DATA=$(INSTALL) -m 644
 INSTALL_BIN=$(INSTALL) -m 755
 INSTALL_LIB=$(INSTALL) -m 755
+INSTALL_SHLIB=$(INSTALL_LIB)
 
 #
 # PATHS
@@ -108,10 +109,10 @@ bindir=@bindir@
 datadir=@datadir@
 mandir=@mandir@
 docdir=@docdir@
-libdir=@libdir@
 libexecdir=@libexecdir@
-MODULE_INSTALLDIR=@MODULE_INSTALLDIR@
+libdir=@libdir@
 LPATH=@LPATH@
+
 #
 # DLL 
 #

diff --git a/configure.in b/configure.in
index 20d8518ce90360e27f73144904361c0724508d67..be422a2b603af783a48689ff0e196ca52096d40a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -74,7 +74,6 @@ AC_SUBST(PGFELIBS)
 AC_SUBST(PGBELIBS)
 AC_SUBST(PGBIN)
 AC_SUBST(PGTEMPLATE)
-AC_SUBST(MODULE_INSTALLDIR)
 AC_SUBST(LPATH)
 PGFEINCLUDES="-I`${PGCONFIG} --includedir`"
 PGFELIBS="-L`${PGCONFIG} --libdir` -lpq"
@@ -332,12 +331,12 @@ if test "${prefix}" = "NONE"; then
                        )"
        fi
        bindir="$(${PGCONFIG} --bindir)"
-       MODULE_INSTALLDIR="`${PGCONFIG} --pkglibdir`"
+       libdir="`${PGCONFIG} --pkglibdir`"
        LPATH='\$$libdir'
 else
        docdir=$docdir/postgis
        datadir=$datadir/postgis
-       MODULE_INSTALLDIR=$libexecdir
+       libdir=$libexecdir
        LPATH=$libexecdir
 fi
 
@@ -402,9 +401,9 @@ AC_MSG_RESULT([     DATA: $datadir])
 AC_MSG_RESULT([      MAN: $mandir])
 AC_MSG_RESULT([      BIN: $bindir])
 if test "$MODULE_INSTALLDIR" = "$LPATH"; then
-       AC_MSG_RESULT([      EXT: $MODULE_INSTALLDIR])
+       AC_MSG_RESULT([      EXT: $libdir])
 else
-       AC_MSG_RESULT([      EXT: $MODULE_INSTALLDIR ($LPATH)])
+       AC_MSG_RESULT([      EXT: $libdir ($LPATH)])
 fi
 
 AC_MSG_RESULT([ -------------------------------------------------------])

diff --git a/lwgeom/Makefile b/lwgeom/Makefile
index fd3b4cd9a4a74bb877693b4b94c9cab456db9ac3..a7aeeebf83fb7df87cd021a5a12169c384bf7f6c 100644 (file)
--- a/lwgeom/Makefile
+++ b/lwgeom/Makefile
@@ -13,19 +13,8 @@ endif
 # Shared library parameters.
 #
 NAME=lwgeom
-
-ifeq ($(findstring mingw,$(HOST_OS)),mingw)
-SHLIB = lib$(NAME).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)$(DLSUFFIX)
-else
-SHLIB = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
-endif
-
-SHLIB_MAJOR     = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
-SHLIB_BARE      = lib$(NAME)$(DLSUFFIX)
 SHLIB_LINK     = $(DLFLAGS) 
 
-MODULE_FILENAME = $(LPATH)/$(SHLIB)
-
 #---------------------------------------------------------------
 # Postgis version and build date
 #---------------------------------------------------------------
@@ -95,6 +84,8 @@ all: $(GEOS_RULES) ../lwpostgis.sql all-shared-lib
 enable_shared=yes
 include Makefile.shlib
 
+MODULE_FILENAME = $(LPATH)/$(shlib)
+
 #---------------------------------------------------------------
 # Makefile targets
 
@@ -127,40 +118,13 @@ lwgeom_functions_basic.o: lwgeom_functions_basic.c profile.h
 lwpostgis.sql: lwpostgis.sql.in
        cpp -P -traditional-cpp -DUSE_VERSION=$(USE_VERSION) $< | sed -e 's:@MODULE_FILENAME@:$(MODULE_FILENAME):g;s:@POSTGIS_VERSION@:$(POSTGIS_VERSION):g;s:@POSTGIS_SCRIPTS_VERSION@:$(SCRIPTS_VERSION):g;s/@POSTGIS_BUILD_DATE@/$(POSTGIS_BUILD_DATE)/g' | grep -v '^#' > $@
 
-install: all install-lwgeom-lib install-lwgeom-scripts
+install: all install-lib-shared install-lwgeom-scripts
 
 install-lwgeom-scripts:
        @mkdir -p $(DESTDIR)$(datadir)
        $(INSTALL_DATA) lwpostgis.sql $(DESTDIR)$(datadir)/lwpostgis.sql
        $(INSTALL_DATA) ../spatial_ref_sys.sql $(DESTDIR)$(datadir)/spatial_ref_sys.sql
 
-#- This has been copied from postgresql and adapted
-install-lwgeom-lib: $(SHLIB)
-       @mkdir -p $(DESTDIR)$(MODULE_INSTALLDIR)
-       $(INSTALL_LIB) $(SHLIB) $(DESTDIR)$(MODULE_INSTALLDIR)/$(SHLIB)
-
-ifneq ($(PORTNAME), cygwin)
-ifneq ($(PORTNAME), win32)
-ifneq ($(PORTNAME), win)
-ifneq ($(SHLIB), $(SHLIB_MAJOR))
-       cd $(DESTDIR)$(MODULE_INSTALLDIR) && \
-       rm -f $(SHLIB_MAJOR) && \
-       ln -sf $(SHLIB) $(SHLIB_MAJOR)
-endif
-ifneq ($(SHLIB), lib$(NAME)$(DLSUFFIX))
-       cd $(DESTDIR)$(MODULE_INSTALLDIR) && \
-       rm -f $(SHLIB_BARE) && \
-       ln -sf $(SHLIB) $(SHLIB_BARE)
-endif
-endif # not win
-endif # not win32
-endif # not cygwin
-
-uninstall-lwgeom-lib: 
-       rm -f $(DESTDIR)$(MODULE_INSTALLDIR)/$(SHLIB)
-       rm -f $(DESTDIR)$(MODULE_INSTALLDIR)/$(SHLIB_MAJOR)
-       rm -f $(DESTDIR)$(MODULE_INSTALLDIR)/$(SHLIB_BARE)
-
 #----------------------------------------------------------
 
 detect_geos_version: 
@@ -170,10 +134,9 @@ uninstall-lwgeom-scripts:
        rm -f $(DESTDIR)$(datadir)/postgis/lwpostgis.sql
        rm -f $(DESTDIR)$(datadir)/postgis/spatial_ref_sys.sql
 
-uninstall: uninstall-lwgeom-lib uninstall-lwgeom-scripts
+uninstall: uninstall-lib uninstall-lwgeom-scripts
 
-clean-lwgeom-lib:
-       rm -f $(SHLIB) $(SHLIB_MAJOR) $(SHLIB_BARE)
+clean-lwgeom-lib: clean-lib
 
 clean distclean: clean-lwgeom-lib
        rm -f *.o *.so *.a test $(OTHERS)