Added missing 'uninstall' rules. Fixed existing install rules.

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

diff --git a/Makefile b/Makefile
index 60a84c88e3e485c4a6cb640f551bc07571a2b1ad..2f89927f0857aa8036a6ec71bba45f7da2c83772 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,8 @@ all: liblwgeom loaderdumper
 
 install: all liblwgeom-install loaderdumper-install
 
+uninstall: liblwgeom-uninstall loaderdumper-uninstall
+
 clean: liblwgeom-clean loaderdumper-clean
 
 liblwgeom: 
@@ -19,6 +21,9 @@ liblwgeom-clean:
 liblwgeom-install:
        $(MAKE) -C lwgeom install
 
+liblwgeom-uninstall:
+       $(MAKE) -C lwgeom uninstall
+
 loaderdumper:
        $(MAKE) -C loader
 
@@ -27,3 +32,6 @@ loaderdumper-clean:
 
 loaderdumper-install:
        $(MAKE) -C loader install
+
+loaderdumper-uninstall:
+       $(MAKE) -C loader uninstall

diff --git a/Makefile.config b/Makefile.config
index 200fcd65408a048e24cb58f87c492f3f433d81fc..8bfdd671f671afaaa46acfed4f738790364ad1a4 100644 (file)
--- a/Makefile.config
+++ b/Makefile.config
@@ -51,6 +51,9 @@ USE_STATS=1
 # set the PGSQL_SRC either below or in the environment (an absolute path).
 #
 # PGSQL_SRC=/usr/src/postgresql
+ifeq (${PGSQL_SRC},) 
+       PGSQL_SRC = ${PWD}/../..
+endif
 
 #
 # Path to library (to be specified in CREATE FUNCTION queries)
@@ -58,15 +61,14 @@ USE_STATS=1
 # Set LPATH below or in the environment to change it.
 #
 # LPATH=/usr/src/postgis
+ifeq (${LPATH},)
+       LPATH := \$$libdir
+endif
 
 #---------------------------------------------------------------
 # END OF CONFIGURATION
 #---------------------------------------------------------------
 
-ifeq (${PGSQL_SRC},) 
-       PGSQL_SRC = ${PWD}/../..
-endif
-
 subdir=contrib/postgis
 top_builddir = ${PGSQL_SRC}
 include $(top_builddir)/src/Makefile.global

diff --git a/loader/Makefile b/loader/Makefile
index 570ad3ad69503413271543b536ae63b6daf81280..37444054fe897244c35e9ac1ff23a45ea8f32f7a 100644 (file)
--- a/loader/Makefile
+++ b/loader/Makefile
@@ -30,6 +30,10 @@ install: all
        $(INSTALL_PROGRAM) pgsql2shp$(EXE) $(DESTDIR)$(bindir)/pgsql2shp$(EXE)
        $(INSTALL_PROGRAM) shp2pgsql$(EXE) $(DESTDIR)$(bindir)/shp2pgsql$(EXE)
 
+uninstall:
+       rm -f $(DESTDIR)$(bindir)/pgsql2shp$(EXE)
+       rm -f $(DESTDIR)$(bindir)/shp2pgsql$(EXE)
+
 clean:
        rm -f $(OBJS) shp2pgsql.o pgsql2shp.o shp2pgsql$(EXE) pgsql2shp$(EXE)
 

diff --git a/lwgeom/Makefile b/lwgeom/Makefile
index 0e665f930268cd739fbb0cd8bbd3a325103907f7..84a505478cfb698c281cae940cfaf9c7ee2fcde6 100644 (file)
--- a/lwgeom/Makefile
+++ b/lwgeom/Makefile
@@ -1,17 +1,8 @@
 # Configuration Directives
-
 include ../Makefile.config
 
 #---------------------------------------------------------------
 subdir=contrib/postgis
-#---------------------------------------------------------------
-# Path to library (to be specified in CREATE FUNCTION queries)
-# Defaults to $libdir.
-# Set LPATH environment variable to change it.
-#
-ifeq (${LPATH},)
-       LPATH := \$$libdir
-endif
 
 #---------------------------------------------------------------
 # Default missing CXX variable to c++
@@ -77,7 +68,7 @@ endif
  
 OBJS=lwgeom_pg.o lwgeom_spheroid.o lwgeom_api.o lwgeom_ogc.o lwgeom_functions_analytic.o lwgeom_geos.o lwgeom_inout.o lwgeom_estimate.o lwgeom_functions_basic.o lwgeom_gist.o lwgeom_btree.o lwgeom_transform.o stringBuffer.o lwgeom_box3d.o lwgeom_box2dfloat4.o lwgeom_chip.o lex.yy.o wktparse.tab.o lwgparse.o wktunparse.o lwgeom_svg.o $(GEOS_WRAPPER)
 
-OTHERS=y.output lex.yy.c wktparse.tab.c wktparse.tab.h lwgeom.sql lwpostgis.sql
+OTHERS=y.output lex.yy.c wktparse.tab.c wktparse.tab.h lwpostgis.sql
 
 
 #---------------------------------------------------------------
@@ -114,14 +105,12 @@ all: all-lib lwpostgis.sql
 
 # Shared library stuff
 
-#lwgeom.sql: lwgeom.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' > $@
-
 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' > $@
 
-install: all installdirs install-lwgeom-lib
-       #$(INSTALL_DATA) lwgeom.sql $(DESTDIR)$(datadir)
+install: all installdirs install-lwgeom-lib install-lwgeom-scripts
+
+install-lwgeom-scripts:
        $(INSTALL_DATA) lwpostgis.sql $(DESTDIR)$(datadir)
 
 #- This has been copied from postgresql and adapted
@@ -146,10 +135,12 @@ detect_geos_version:
        ../geos_version.sh $(GEOS_DIR) > postgis_geos_version.h
 
 installdirs:
-       $(mkinstalldirs) $(docdir)/contrib $(datadir)/contrib $(libdir)
+       $(mkinstalldirs) $(libdir)
+
+uninstall-lwgeom-scripts:
+       rm -f $(DESTDIR)$(datadir)/lwpostgis.sql
 
-uninstall: uninstall-lib
-       @rm -f $(datadir)/contrib/lwgeom.sql
+uninstall: uninstall-lib uninstall-lwgeom-scripts
 
 clean distclean maintainer-clean: clean-lib
        @rm -f $(OBJS)