apply Makefile.am fixes from sjackman@bcgsc.ca

diff --git a/lib/common/Makefile.am b/lib/common/Makefile.am
index 348362f647656dcb1e25d9b4c54e1102e3ee07c8..69c37d4c704ba3fe1abf010a6b5db9b5e5ecdd37 100644 (file)
--- 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 5f42e37e8f9ac0d90bd9c8d8c2973c016c52ff21..edfe22771240642322264ac6435680e98626677c 100644 (file)
--- 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 b6f54d2d9b11278e3d85aeb0601164cd60332a02..0e208cfdafcd7f7a4957c43115d7010be56e0cd8 100644 (file)
--- 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) \