Changed GEOS header inclusion mechanism to be more polite

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

diff --git a/Makefile b/Makefile
index 2fa6d0477e480005af8d09f8c42bfaddfd56aad8..b1771c3a28f536ed04b7c392476b35a3d3784379 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -106,7 +106,7 @@ override CFLAGS += -I$(srcdir) -DFRONTEND -DSYSCONFDIR='"$(sysconfdir)"'
 override CFLAGS += -DUSE_VERSION=$(USE_VERSION)
 
 ifeq ($(USE_GEOS),1)
-       override CFLAGS += -I$(GEOS_DIR)/include/geos -DUSE_GEOS
+       override CFLAGS += -I$(GEOS_DIR)/include -DUSE_GEOS
 endif
 ifeq ($(USE_PROJ),1)
        override CFLAGS += -I$(PROJ_DIR)/include -DUSE_PROJ 

diff --git a/postgis_geos_wrapper.cpp b/postgis_geos_wrapper.cpp
index 9d13f4fed7eadcbfcefb087ccf8ef4c82ea3bf7d..6ad03d3ec20c1273f1ba5e1674cc420eb524359a 100644 (file)
--- a/postgis_geos_wrapper.cpp
+++ b/postgis_geos_wrapper.cpp
@@ -2,6 +2,9 @@
 
 /*
 * $Log$
+* Revision 1.23  2004/07/02 13:33:23  strk
+* Changed GEOS header inclusion mechanism to be more polite
+*
 * Revision 1.22  2004/07/01 17:02:26  strk
 * Updated to support latest GEOS API.
 *
@@ -59,9 +62,9 @@
 #include <iostream>
 #include <fstream>
 
-#include "geom.h"
-#include "util.h"
 #include "postgis_geos_version.h"
+#include "geos/geom.h"
+#include "geos/util.h"
 
 using namespace geos;