diff --git a/Makefile.in b/Makefile.in
index b9da0a825..d333c4aab 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,7 +18,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.20 1999/09/29 01:50:35 steve Exp $"
+#ident "$Id: Makefile.in,v 1.21 1999/10/16 17:03:49 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -77,8 +77,13 @@ Makefile: Makefile.in config.status
 # the configured copy.
 tmp1 = bindir
 tmp2 = libdir
+tmp3 = includedir
+tmp4 = CXX
 verilog: $(srcdir)/verilog.sh
-	sed -e 's;@$(tmp1)@;@bindir@;' -e 's;@$(tmp2)@;@libdir@;' < $< > $@
+	sed -e 's;@$(tmp1)@;@bindir@;' \
+	    -e 's;@$(tmp2)@;@libdir@;' \
+	    -e 's;@$(tmp3)@;@includedir@;' \
+	    -e 's;@$(tmp4)@;@CXX@;' < $< > $@
 
 ivl: $O
 	$(CXX) $(CXXFLAGS) -o ivl $O
diff --git a/verilog.sh b/verilog.sh
index 0ab922444..15428aa01 100644
--- a/verilog.sh
+++ b/verilog.sh
@@ -24,13 +24,15 @@
 execPath=@bindir@
 execIVLPP=${execPath}/ivlpp
 execIVL=${execPath}/ivl
-execCpp=/usr/bin/g++
+execCpp=@CXX@
 
 tmpDir=/tmp
 tmpPPFile=${tmpDir}/ivl$$.pp
 tmpCCFile=${tmpDir}/ivl$$.cc
 
-VPIModulePath=@libdir@/ivl:.
+includedir=@includedir@
+libdir=@libdir@
+VPIModulePath=@libdir@/ivl
 
 target="vvm"
 targetSuffix=""
@@ -111,7 +113,7 @@ case "${target}" in
 
     "xnf") mv ${tmpCCFile} ${outputFile} ;;
 
-    "vvm")  ${execCpp} -rdynamic ${tmpCCFile} -o ${outputFile} -lvvm -ldl ;
+    "vvm")  ${execCpp} -rdynamic -I${includedir} -L${libdir} ${tmpCCFile} -o ${outputFile} -lvvm -ldl ;
 	    if test $? -ne 0 ; then
 	     echo "C++ compilation failed. Terminating compilation."
 	     rm -f ${tmpCCFile}