From 44a78cc1782990a68693db368b8b772868d01414 Mon Sep 17 00:00:00 2001
From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Mon, 17 Aug 2020 19:48:46 -0700
Subject: [PATCH] disambiguate lib/inkpot/*.c #includes

Related to #1785.
---
 lib/inkpot/Makefile.am     |  2 ++
 lib/inkpot/data/xcolors.c  |  2 +-
 lib/inkpot/inkpot.c        |  2 +-
 lib/inkpot/inkpot_scheme.c | 16 ++++++++--------
 lib/inkpot/inkpot_value.c  |  8 ++++----
 lib/inkpot/inkpot_xlate.c  |  2 +-
 6 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/lib/inkpot/Makefile.am b/lib/inkpot/Makefile.am
index f52d57b8a..e95dd2a7f 100644
--- a/lib/inkpot/Makefile.am
+++ b/lib/inkpot/Makefile.am
@@ -6,6 +6,8 @@ INKPOT_VERSION="1:0:0"
 pdfdir = $(pkgdatadir)/doc/pdf
 pkgconfigdir = $(libdir)/pkgconfig
 
+AM_CPPFLAGS = -I$(top_srcdir)/lib
+
 pkginclude_HEADERS = inkpot.h
 lib_LTLIBRARIES = libinkpot.la
 pkgconfig_DATA = libinkpot.pc
diff --git a/lib/inkpot/data/xcolors.c b/lib/inkpot/data/xcolors.c
index bdd106dde..0617da0f5 100644
--- a/lib/inkpot/data/xcolors.c
+++ b/lib/inkpot/data/xcolors.c
@@ -13,7 +13,7 @@
  */
 
 #include <tkInt.h>
-#include "strcasecmp.h"
+#include <cgraph/strcasecmp.h>
 
 /*
  * This value will be set to the number of colors in the color table
diff --git a/lib/inkpot/inkpot.c b/lib/inkpot/inkpot.c
index 49d93af05..44b4b1071 100644
--- a/lib/inkpot/inkpot.c
+++ b/lib/inkpot/inkpot.c
@@ -17,7 +17,7 @@
 #include <getopt.h>
 #include <assert.h>
 
-#include "inkpot.h"
+#include <inkpot/inkpot.h>
 
 char *Info[] = {
     "inkpot",                   /* Program */
diff --git a/lib/inkpot/inkpot_scheme.c b/lib/inkpot/inkpot_scheme.c
index 1cc10d326..2c94c8cf9 100644
--- a/lib/inkpot/inkpot_scheme.c
+++ b/lib/inkpot/inkpot_scheme.c
@@ -17,14 +17,14 @@
 #include <ctype.h>
 #include <assert.h>
 
-#include "inkpot.h"
-
-#include "inkpot_lib_define.h"
-#include "inkpot_value.h"
-#include "inkpot_scheme.h"
-#include "inkpot_xlate.h"
-#include "inkpot_lib_scheme.h"
-#include "inkpot_lib_string.h"
+#include <inkpot/inkpot.h>
+
+#include <inkpot/inkpot_lib_define.h>
+#include <inkpot/inkpot_value.h>
+#include <inkpot/inkpot_scheme.h>
+#include <inkpot/inkpot_xlate.h>
+#include <inkpot/inkpot_lib_scheme.h>
+#include <inkpot/inkpot_lib_string.h>
 
 static size_t inkpot_writer (void *closure, const char *data, size_t length)
 {
diff --git a/lib/inkpot/inkpot_value.c b/lib/inkpot/inkpot_value.c
index f4accbc2c..ec43c9cc5 100644
--- a/lib/inkpot/inkpot_value.c
+++ b/lib/inkpot/inkpot_value.c
@@ -15,10 +15,10 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "inkpot.h"
-#include "inkpot_lib_define.h"
-#include "inkpot_value.h"
-#include "inkpot_lib_value.h"
+#include <inkpot/inkpot.h>
+#include <inkpot/inkpot_lib_define.h>
+#include <inkpot/inkpot_value.h>
+#include <inkpot/inkpot_lib_value.h>
 
 inkpot_status_t inkpot_value_set ( inkpot_values_t *values, inkpot_value_t *value )
 {
diff --git a/lib/inkpot/inkpot_xlate.c b/lib/inkpot/inkpot_xlate.c
index ed35dd63a..b897f8f11 100644
--- a/lib/inkpot/inkpot_xlate.c
+++ b/lib/inkpot/inkpot_xlate.c
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "inkpot_xlate.h"
+#include <inkpot/inkpot_xlate.h>
 
 void hsva2rgba(double hsva[4], double rgba[4])
 {
-- 
2.40.0