From: John Ellson <ellson@research.att.com>
Date: Thu, 1 Mar 2012 00:28:18 +0000 (-0500)
Subject: apply Makefile.am fixes from sjackman@bcgsc.ca
X-Git-Tag: LAST_LIBGRAPH~32^2~466^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a21ff3effc7b8222f47f35f2e591c32b8f2dadcd;p=graphviz

apply Makefile.am fixes from sjackman@bcgsc.ca
---

diff --git a/lib/common/Makefile.am b/lib/common/Makefile.am
index 348362f64..69c37d4c7 100644
--- a/lib/common/Makefile.am
+++ b/lib/common/Makefile.am
@@ -42,7 +42,7 @@ fontmetrics.o fontmetrics.lo: ps_font_equiv.h
 
 # ensure font names are properly sorted for bsearch operation 
 ps_font_equiv.h: $(srcdir)/ps_font_equiv.txt $(srcdir)/fontmap.cfg $(srcdir)/ps_fontmap.txt
-	cp ps_fontmap.txt ps_font_equiv.h
+	cp $(srcdir)/ps_fontmap.txt ps_font_equiv.h
 	./mksvgfonts.pl fontmap.cfg ps_font_equiv.txt | LC_ALL=C $(SORT) >>ps_font_equiv.h
 
 colxlate.o colxlate.lo : colortbl.h
diff --git a/lib/gvpr/Makefile.am b/lib/gvpr/Makefile.am
index 5f42e37e8..edfe22771 100644
--- a/lib/gvpr/Makefile.am
+++ b/lib/gvpr/Makefile.am
@@ -14,6 +14,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/ast \
 	-I$(top_srcdir)/lib/ingraphs \
 	-I$(top_srcdir)/lib/common \
+	-I$(top_builddir)/lib/common \
 	-I$(top_srcdir)/lib/cgraph \
 	-I$(top_srcdir)/lib/cdt \
 	-DDFLT_GVPRPATH="\".$(PATH_SEPARATOR)$(pkgdatadir)/gvpr\""
diff --git a/plugin/pango/Makefile.am b/plugin/pango/Makefile.am
index b6f54d2d9..0e208cfda 100644
--- a/plugin/pango/Makefile.am
+++ b/plugin/pango/Makefile.am
@@ -10,6 +10,7 @@ endif
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/lib/common \
+	-I$(top_builddir)/lib/common \
 	-I$(top_srcdir)/lib/pathplan \
 	-I$(top_srcdir)/lib/gvc \
 	-I$(top_srcdir)/lib/$(GRAPH) \