From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sat, 29 Aug 2020 03:18:58 +0000 (-0700)
Subject: disambiguate plugin/gs #includes
X-Git-Tag: 2.46.0~20^2^2~69^2~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f38b73622488aee4ecd1a263584c5066920b0a89;p=graphviz

disambiguate plugin/gs #includes

Related to #1785.
---

diff --git a/plugin/gs/Makefile.am b/plugin/gs/Makefile.am
index 4ed8ccaa2..57057d3f5 100644
--- a/plugin/gs/Makefile.am
+++ b/plugin/gs/Makefile.am
@@ -2,6 +2,7 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
+	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/lib/common \
 	-I$(top_srcdir)/lib/pathplan \
 	-I$(top_srcdir)/lib/gvc \
diff --git a/plugin/gs/gvloadimage_gs.c b/plugin/gs/gvloadimage_gs.c
index a33354da7..417087b15 100644
--- a/plugin/gs/gvloadimage_gs.c
+++ b/plugin/gs/gvloadimage_gs.c
@@ -17,7 +17,7 @@
 #include <stdint.h>
 #include <sys/stat.h>
 
-#include "gvplugin_loadimage.h"
+#include <gvc/gvplugin_loadimage.h>
 
 #ifdef HAVE_GS
 #ifdef HAVE_PANGOCAIRO
diff --git a/plugin/gs/gvplugin_gs.c b/plugin/gs/gvplugin_gs.c
index b7a6f785a..5e0fa60fd 100644
--- a/plugin/gs/gvplugin_gs.c
+++ b/plugin/gs/gvplugin_gs.c
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "gvplugin.h"
+#include <gvc/gvplugin.h>
 
 extern gvplugin_installed_t gvloadimage_gs_types[];