[postgis-tickets] r16813 - Try to force liblwgeom source include to be referenced first before the installed locations.

[Regina Obe]

Author: robe
Date: 2018-09-16 13:24:45 -0700 (Sun, 16 Sep 2018)
New Revision: 16813

Modified:
   branches/2.5/doc/html/image_src/Makefile.in
   branches/2.5/raster/rt_pg/Makefile.in
Log:
Try to force  liblwgeom source include to be referenced first before the installed locations. 
When installed, the installed one sometimes gets picked up instead of the source one.
References #4180

Modified: branches/2.5/doc/html/image_src/Makefile.in
===================================================================
--- branches/2.5/doc/html/image_src/Makefile.in	2018-09-16 20:02:09 UTC (rev 16812)
+++ branches/2.5/doc/html/image_src/Makefile.in	2018-09-16 20:24:45 UTC (rev 16813)
@@ -16,7 +16,7 @@
 LIBTOOL = @LIBTOOL@
 
 CUNIT_LDFLAGS=@CUNIT_LDFLAGS@
-CUNIT_CPPFLAGS=@CUNIT_CPPFLAGS@ -I../../../liblwgeom
+CUNIT_CPPFLAGS=-I../../../liblwgeom @CUNIT_CPPFLAGS@
 
 IMAGES= \
 	../images/de9im01.png \

Modified: branches/2.5/raster/rt_pg/Makefile.in
===================================================================
--- branches/2.5/raster/rt_pg/Makefile.in	2018-09-16 20:02:09 UTC (rev 16812)
+++ branches/2.5/raster/rt_pg/Makefile.in	2018-09-16 20:24:45 UTC (rev 16813)
@@ -67,7 +67,7 @@
 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'