Removed PGXS and added explicit bin path variable. Works now in 8.4, 9.0 and 9.1...

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

diff --git a/raster/loader/Makefile.in b/raster/loader/Makefile.in
index edd5b2a28bd16c4901bb43aeb661995bb1e3544b..4e819839cb8fdf50b46977b0b0946b5941012200 100644 (file)
--- a/raster/loader/Makefile.in
+++ b/raster/loader/Makefile.in
@@ -10,16 +10,6 @@
 #
 #############################################################################
 
-# PGXS information
-#
-# Note that PGXS currently doesn't handle building FE executables, but we need
-# the DESTDIR variable so we can get the correct install paths. 
-# Hence we include the PGXS Makefile here, but ensure that we override the
-# 'all' and 'install' targets with the ones we really want to use below.
-PG_CONFIG = @PGCONFIG@
-PGXS := @PGXS@
-include $(PGXS)
-
 # Set CFLAGS afer PGXS, otherwise it will get overwritten with the PGXS
 # version which is not what we want. 
 CC=@CC@
@@ -32,6 +22,9 @@ LIBTOOL = @LIBTOOL@
 # Filenames with extension as determined by the OS
 RASTER2PGSQL=raster2pgsql@EXESUFFIX@
 
+# PostgreSQL executable directory
+PGSQL_BINDIR=@PGSQL_BINDIR@
+
 RT_CORE=../rt_core
 
 LIBLWGEOM_LDFLAGS=@LIBLWGEOM_LDFLAGS@
@@ -69,10 +62,10 @@ $(RASTER2PGSQL): raster2pgsql.o $(RT_CORE)/librtcore.a
        $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@
 
 installdir:
-       mkdir -p $(DESTDIR)$(bindir)
+       @mkdir -p $(DESTDIR)$(PGSQL_BINDIR)
 
 install: installdir
-       $(LIBTOOL) --mode=install $(INSTALL) $(RASTER2PGSQL) "$(DESTDIR)$(bindir)/$(RASTER2PGSQL)"
+       $(LIBTOOL) --mode=install $(INSTALL) $(RASTER2PGSQL) "$(DESTDIR)$(PGSQL_BINDIR)/$(RASTER2PGSQL)"
 
 $(RT_CORE)/librtcore.a:
        $(MAKE) -C ../rt_core