Include liblwgeom first

Ported from r16813 (2.5)
References #4180
References #4260

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

diff --git a/doc/html/image_src/Makefile.in b/doc/html/image_src/Makefile.in
index 88e0432bfc48c4ae5d1ccc4c8e54b756b7044fd4..243fd43c4644ed9280680d7d62c1d8e25bdba034 100644 (file)
--- a/doc/html/image_src/Makefile.in
+++ b/doc/html/image_src/Makefile.in
@@ -16,7 +16,7 @@ SHELL = @SHELL@
 LIBTOOL = @LIBTOOL@
 
 CUNIT_LDFLAGS=@CUNIT_LDFLAGS@
-CUNIT_CPPFLAGS=@CUNIT_CPPFLAGS@ -I../../../liblwgeom
+CUNIT_CPPFLAGS=-I../../../liblwgeom @CUNIT_CPPFLAGS@
 
 IMAGES= \
        ../images/de9im01.png \

diff --git a/raster/rt_pg/Makefile.in b/raster/rt_pg/Makefile.in
index 81113654f83f5c02a4ba217c9825f11de5354551..587699c542d41cbae45b5caa4aca1d2d15f45368 100644 (file)
--- a/raster/rt_pg/Makefile.in
+++ b/raster/rt_pg/Makefile.in
@@ -76,7 +76,7 @@ LIBGDAL_LDFLAGS=@LIBGDAL_LDFLAGS@
 LIBPROJ_CFLAGS=@PROJ_CPPFLAGS@
 
 CC = @CC@
-PG_CPPFLAGS+= @CPPFLAGS@ @CFLAGS@ $(LIBGDAL_CFLAGS) $(LIBLWGEOM_CFLAGS) $(LIBPGCOMMON_CFLAGS) $(LIBPROJ_CFLAGS) -I../rt_core
+PG_CPPFLAGS+= $(LIBLWGEOM_CFLAGS) @CPPFLAGS@ @CFLAGS@ $(LIBGDAL_CFLAGS) $(LIBPGCOMMON_CFLAGS) $(LIBPROJ_CFLAGS) -I../rt_core
 SHLIB_LINK_F = ../rt_core/librtcore.a $(LIBLWGEOM_LDFLAGS) $(LIBPGCOMMON_LDFLAGS) $(LIBGDAL_LDFLAGS) @SHLIB_LINK@
 
 # Extra files to remove during 'make clean'