From 498f19a6a185730f1feb70d82185c730e6718d1a Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Fri, 18 Nov 2016 21:13:56 -0500
Subject: [PATCH] Use VERILATOR_INCLUDE in generated files to allow relocation.

---
 Changes             | 4 ++++
 Makefile.in         | 4 +++-
 nodist/install_test | 3 ++-
 src/Makefile_obj.in | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Changes b/Changes
index dfde36f6d..ec8a01d4f 100644
--- a/Changes
+++ b/Changes
@@ -5,8 +5,12 @@ The contributors that suggested a given feature are shown in []. Thanks!
 
 * Verilator 3.889 devel
 
+***   Use $VERILATOR_INCLUDE in generated files to allow relocation.
+
 ***   Honor --output-split on coverage constructors, bug1098. [Johan Bjork]
 
+****  Fix various issues when making outside of the kit.
+
 ****  Fix flex 2.6.2 bug, bug1103. [Sergey Kvachonok]
 
 ****  Fix error on bad interface name, bug1097. [Todd Strader]
diff --git a/Makefile.in b/Makefile.in
index ea8e0b9ac..3c4e242f7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -270,6 +270,7 @@ VL_INST_BIN_FILES = verilator verilator_bin verilator_bin_dbg verilator_coverage
 VL_INST_MAN_FILES = verilator.1 verilator_coverage.1 verilator_profcfunc.1
 
 VL_INST_INC_BLDDIR_FILES = \
+	include/verilated_config.h \
 	include/verilated.mk \
 
 # Files under srcdir, instead of build time
@@ -297,7 +298,8 @@ installbin:
 # So important we use $< so VPATH is searched
 installman: $(VL_INST_MAN_FILES)
 	$(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(mandir)/man1
-	for p in $^ ; do \
+	cd $(srcdir) \
+	; for p in $(VL_INST_MAN_FILES) ; do \
 	  $(INSTALL_DATA) $$p $(DESTDIR)$(mandir)/man1/$$p; \
 	done
 
diff --git a/nodist/install_test b/nodist/install_test
index 095a7e158..b431375f9 100755
--- a/nodist/install_test
+++ b/nodist/install_test
@@ -115,7 +115,8 @@ sub write_verilog {
 
 sub cleanenv {
     foreach my $var (keys %ENV) {
-	if ($var eq "VERILATOR_ROOT") {
+	if ($var eq "VERILATOR_ROOT"
+	    || $var eq "VERILATOR_INCLUDE") {
 	    print "unset $var # Was '$ENV{$var}'\n";
 	    delete $ENV{$var}
 	}
diff --git a/src/Makefile_obj.in b/src/Makefile_obj.in
index f2a4b757d..24fdf3a43 100644
--- a/src/Makefile_obj.in
+++ b/src/Makefile_obj.in
@@ -302,7 +302,7 @@ serial:: V3Ast__gen_classes.h V3ParseBison.c
 
 serial_vlcov:: vlcovgen.d
 
-vlcovgen.d: $(VLCOVGEN) $(srcdir)/include/verilated_cov_key.h
+vlcovgen.d: $(VLCOVGEN) $(srcdir)/../include/verilated_cov_key.h
 	$(PERL) $(VLCOVGEN) --srcdir $(srcdir)
 	touch $@