disambiguate tclpkg/tclpathplan #includes

Related to #1242 and #1785.

diff --git a/tclpkg/tclpathplan/Makefile.am b/tclpkg/tclpathplan/Makefile.am
index 21ed52c9645f7ade0ce6ff99c8554a21d92323e2..d6aea2095eefb7c16a21115573af61cf332f0539 100644 (file)
--- a/tclpkg/tclpathplan/Makefile.am
+++ b/tclpkg/tclpathplan/Makefile.am
@@ -6,6 +6,7 @@ SUBDIRS = demo
 pkgtcldir = $(pkglibdir)/tcl
 
 AM_CPPFLAGS = \
+       -I$(top_srcdir)/lib \
        -I$(top_srcdir)/tclpkg/tclhandle \
        -I$(top_srcdir)/lib/pathplan @TCL_INCLUDES@
 

diff --git a/tclpkg/tclpathplan/makecw.c b/tclpkg/tclpathplan/makecw.c
index 35af3669f4105a309972b5b8d32bd540d0a657e9..3bf77366455fb97045a835c622afef3293613908 100644 (file)
--- a/tclpkg/tclpathplan/makecw.c
+++ b/tclpkg/tclpathplan/makecw.c
@@ -20,7 +20,7 @@
  * ellson@graphviz.org    October 2nd, 1996
  */
 
-#include <pathutil.h>
+#include <pathplan/pathutil.h>
 
 void make_CW(Ppoly_t * poly)
 {

diff --git a/tclpkg/tclpathplan/tclpathplan.c b/tclpkg/tclpathplan/tclpathplan.c
index b0581c9b14c90a948f7a5e19c43f6e278ad1883d..8caf370136afd2e3d25dfedfe543477ddfe45021 100644 (file)
--- a/tclpkg/tclpathplan/tclpathplan.c
+++ b/tclpkg/tclpathplan/tclpathplan.c
@@ -35,9 +35,9 @@
 #include <inttypes.h>
 #include <assert.h>
 #include <math.h>
-#include <pathutil.h>
-#include <vispath.h>
-#include <tri.h>
+#include <pathplan/pathutil.h>
+#include <pathplan/vispath.h>
+#include <pathplan/tri.h>
 #include <tcl.h>
 #include "tclhandle.h"