Revert change made in r8383. Install of loader doesn't work correctly without PGXS...

Associated ticket is #1370.

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

diff --git a/raster/loader/Makefile.in b/raster/loader/Makefile.in
index 445c249f090d98e69426500432e589f4c518a2b3..edd5b2a28bd16c4901bb43aeb661995bb1e3544b 100644 (file)
--- a/raster/loader/Makefile.in
+++ b/raster/loader/Makefile.in
@@ -10,7 +10,18 @@
 #
 #############################################################################
 
-# Set CFLAGS
+# 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@
 CFLAGS=@CFLAGS@ @PICFLAGS@ @WARNFLAGS@ @PROJ_CPPFLAGS@
 top_builddir = @top_builddir@
@@ -58,7 +69,7 @@ $(RASTER2PGSQL): raster2pgsql.o $(RT_CORE)/librtcore.a
        $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@
 
 installdir:
-       @mkdir -p $(DESTDIR)$(bindir)
+       mkdir -p $(DESTDIR)$(bindir)
 
 install: installdir
        $(LIBTOOL) --mode=install $(INSTALL) $(RASTER2PGSQL) "$(DESTDIR)$(bindir)/$(RASTER2PGSQL)"