make sure pgraster is rebuilt if headers change inside the postgis plugin dir

plugins/input/pgraster/build.py

@@ -38,9 +38,6 @@ plugin_sources = Split(
 cxxflags = []
 plugin_env['LIBS'] = []
 
-# TODO: use variable for top-level dir
-plugin_env['CXXFLAGS'].append('-Iplugins/input/postgis')
-
 if env['RUNTIME_LINK'] == 'static':
     # pkg-config is more reliable than pg_config across platforms
     cmd = 'pkg-config libpq --libs --static'

plugins/input/pgraster/pgraster_datasource.cpp

@@ -20,10 +20,10 @@
  *
  *****************************************************************************/
 
-#include "connection_manager.hpp"
+#include "../postgis/connection_manager.hpp"
+#include "../postgis/asyncresultset.hpp"
 #include "pgraster_datasource.hpp"
 #include "pgraster_featureset.hpp"
-#include "asyncresultset.hpp"
 
 // mapnik
 #include <mapnik/debug.hpp>

plugins/input/pgraster/pgraster_datasource.hpp

@@ -42,9 +42,9 @@
 #include <string>
 #include <memory>
 
-#include "connection_manager.hpp"
-#include "resultset.hpp"
-#include "cursorresultset.hpp"
+#include "../postgis/connection_manager.hpp"
+#include "../postgis/resultset.hpp"
+#include "../postgis/cursorresultset.hpp"
 
 using mapnik::transcoder;
 using mapnik::datasource;

plugins/input/pgraster/pgraster_featureset.cpp

@@ -22,8 +22,8 @@
 
 #include "pgraster_featureset.hpp"
 #include "pgraster_wkb_reader.hpp"
-#include "resultset.hpp"
-#include "cursorresultset.hpp"
+#include "../postgis/resultset.hpp"
+#include "../postgis/cursorresultset.hpp"
 
 // mapnik
 #include <mapnik/global.hpp>