From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Thu, 3 Sep 2020 03:51:07 +0000 (-0700)
Subject: disambiguate tclpkg/tclpathplan #includes
X-Git-Tag: 2.46.0~20^2^2~63^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5ae6926db484707e39ae50fbd61c37c8594f89f2;p=graphviz

disambiguate tclpkg/tclpathplan #includes

Related to #1242 and #1785.
---

diff --git a/tclpkg/tclpathplan/Makefile.am b/tclpkg/tclpathplan/Makefile.am
index 21ed52c96..d6aea2095 100644
--- 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 35af3669f..3bf773664 100644
--- 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 b0581c9b1..8caf37013 100644
--- 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"