Remove reliance on `pwd` for raster build and test.

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

diff --git a/configure.ac b/configure.ac
index a21ed0d13ef188406bc06b1b6e593f1fcd693eb9..f0e4f7cfa45afe4201ab0ef1c319631d773b1c00 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -911,21 +911,6 @@ if test "x$with_raster" != "xno"; then dnl # {
     AC_SUBST([POSTGIS_RASTER_BUILD_DATE])
     AC_SUBST([POSTGIS_RASTER_SCRIPTS_VERSION])
 
-    dnl ================================================
-    dnl Vars needed for raster extension
-    dnl ================================================
-    POSTGIS_SRCDIR=`$PWDREGRESS`
-    LIBLWGEOM_CFLAGS="-I${POSTGIS_SRCDIR}/liblwgeom"
-    LIBLWGEOM_LDFLAGS="${POSTGIS_SRCDIR}/liblwgeom/.libs/liblwgeom.a"
-    LIBPGCOMMON_CFLAGS="-I${POSTGIS_SRCDIR}/libpgcommon"
-    LIBPGCOMMON_LDFLAGS="${POSTGIS_SRCDIR}/libpgcommon/libpgcommon.a"
-
-    AC_SUBST([POSTGIS_SRCDIR])
-    AC_SUBST([LIBLWGEOM_CFLAGS])
-    AC_SUBST([LIBLWGEOM_LDFLAGS])
-    AC_SUBST([LIBPGCOMMON_CFLAGS])
-    AC_SUBST([LIBPGCOMMON_LDFLAGS])
-
     dnl ===========================================================================
     dnl Allow output of double truncation warnings with --with-raster-dblwarning
     dnl ===========================================================================

diff --git a/raster/loader/Makefile.in b/raster/loader/Makefile.in
index 53518a71c959dabc791f9c98b0b8c5ce421e89cf..3e81262d5f42e3c15ed1db6abd159272945d25e2 100644 (file)
--- a/raster/loader/Makefile.in
+++ b/raster/loader/Makefile.in
@@ -28,7 +28,7 @@ PGSQL_BINDIR=@PGSQL_BINDIR@
 RT_CORE=../rt_core
 
 LIBLWGEOM_LDFLAGS=../../liblwgeom/liblwgeom.la
-LIBLWGEOM_CFLAGS=@LIBLWGEOM_CFLAGS@
+LIBLWGEOM_CFLAGS=-I../../liblwgeom
 LIBGDAL_CFLAGS=@LIBGDAL_CFLAGS@
 LIBGDAL_LDFLAGS=@LIBGDAL_LDFLAGS@
 PROJ_CFLAGS=@PROJ_CPPFLAGS@

diff --git a/raster/rt_core/Makefile.in b/raster/rt_core/Makefile.in
index cc936699f65ef34b8bc497959934f1f8ca79d871..4392cc1aefe43897536c7f49ec913f1c9a118537 100644 (file)
--- a/raster/rt_core/Makefile.in
+++ b/raster/rt_core/Makefile.in
@@ -11,8 +11,8 @@
 AR=ar rs
 
 CC=@CC@
-LIBLWGEOM_LDFLAGS=@LIBLWGEOM_LDFLAGS@
-LIBLWGEOM_CFLAGS=@LIBLWGEOM_CFLAGS@
+LIBLWGEOM_LDFLAGS=../../liblwgeom/.libs/liblwgeom.a
+LIBLWGEOM_CFLAGS=-I../../liblwgeom
 LIBGDAL_CFLAGS=@LIBGDAL_CFLAGS@
 LIBGDAL_LDFLAGS=@LIBGDAL_LDFLAGS@
 GEOS_LDFLAGS=@GEOS_LDFLAGS@ -lgeos_c

diff --git a/raster/rt_pg/Makefile.in b/raster/rt_pg/Makefile.in
index 825439bd86b1b1d3b80f97d470420f099ac10194..2690c17595f534c24aa43d3478bf3050de2ebd38 100644 (file)
--- a/raster/rt_pg/Makefile.in
+++ b/raster/rt_pg/Makefile.in
@@ -31,11 +31,10 @@ OBJS=rt_pg.o
 # older version of PostGIS, rather than with the static liblwgeom.a 
 # supplied with newer versions of PostGIS
 #
-
-LIBLWGEOM_LDFLAGS=@LIBLWGEOM_LDFLAGS@
-LIBLWGEOM_CFLAGS=@LIBLWGEOM_CFLAGS@
-LIBPGCOMMON_CFLAGS=@LIBPGCOMMON_CFLAGS@
-LIBPGCOMMON_LDFLAGS=@LIBPGCOMMON_LDFLAGS@
+LIBLWGEOM_LDFLAGS=../../liblwgeom/.libs/liblwgeom.a
+LIBLWGEOM_CFLAGS="-I../../liblwgeom"
+LIBPGCOMMON_CFLAGS="-I../../libpgcommon"
+LIBPGCOMMON_LDFLAGS=../../libpgcommon/libpgcommon.a
 LIBGDAL_CFLAGS=@LIBGDAL_CFLAGS@
 LIBGDAL_LDFLAGS=@LIBGDAL_LDFLAGS@
 LIBPROJ_CFLAGS=@PROJ_CPPFLAGS@

diff --git a/raster/test/core/Makefile.in b/raster/test/core/Makefile.in
index 17a290b44e00849a7b6536d252b292cf2590444e..eadde58d7c34706fcf7b2b45ea3192286bd97ec6 100644 (file)
--- a/raster/test/core/Makefile.in
+++ b/raster/test/core/Makefile.in
@@ -10,8 +10,8 @@
 
 RT_CORE=../../rt_core
 
-LIBLWGEOM_LDFLAGS=@LIBLWGEOM_LDFLAGS@
-LIBLWGEOM_CFLAGS=@LIBLWGEOM_CFLAGS@
+LIBLWGEOM_LDFLAGS=../../../liblwgeom/.libs/liblwgeom.a
+LIBLWGEOM_CFLAGS=-I../../../liblwgeom
 LIBGDAL_CFLAGS=@LIBGDAL_CFLAGS@
 LIBGDAL_LDFLAGS=@LIBGDAL_LDFLAGS@
 PROJ_CFLAGS=@PROJ_CPPFLAGS@

diff --git a/raster/test/regress/Makefile.in b/raster/test/regress/Makefile.in
index ec415423a6877a0257d1cf22167fb985088670af..db727fc54bf9a69ba20140b80ff51c1e784146db 100644 (file)
--- a/raster/test/regress/Makefile.in
+++ b/raster/test/regress/Makefile.in
@@ -11,7 +11,7 @@
 #
 #############################################################################
 
-POSTGIS_SRC=@POSTGIS_SRCDIR@
+POSTGIS_SRC=../../..
 
 # MingW hack: rather than use PGSQL_BINDIR directly, we change
 # to the directory and then use "pwd" to return the path. This
@@ -158,8 +158,7 @@ check:
 #      $(RM) run_test
 #      $(RM) testgdalraster
 
-testgdalraster: testgdalraster.in Makefile
-       sed -e "s#@POSTGIS_SRC@#$(POSTGIS_SRC)#" $< > $@
+testgdalraster:
        chmod +x $@
        chmod +x ../../scripts/python/rtgdalraster.py
        ./testgdalraster

diff --git a/raster/test/regress/testgdalraster.in b/raster/test/regress/testgdalraster
similarity index 99%
rename from raster/test/regress/testgdalraster.in
rename to raster/test/regress/testgdalraster
index ecb3a3f607d04c457bf13cf299a8d203d8490152..ef9cf10e8cd7a91f8a927680970613a8e04d9836 100644 (file)
--- a/raster/test/regress/testgdalraster.in
+++ b/raster/test/regress/testgdalraster
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-POSTGIS_SRC=@POSTGIS_SRC@
+POSTGIS_SRC=../../..
 RTGDAL=${POSTGIS_SRC}/raster/scripts/python/rtgdalraster.py
 DB=postgis_reg
 DBENABLERS="${POSTGIS_SRC}/postgis/postgis.sql ../../rt_pg/rtpostgis.sql"