From b175e4aef71d4587c184ab8fc15ddbda87daa7c6 Mon Sep 17 00:00:00 2001
From: steve <steve>
Date: Mon, 1 May 2000 23:55:22 +0000
Subject: [PATCH]  Better inc and lib paths for iverilog.

---
 Makefile.in |  4 ++--
 iverilog.c  | 10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index e6d1b688f..28de0ce49 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.48 2000/04/28 16:50:53 steve Exp $"
+#ident "$Id: Makefile.in,v 1.49 2000/05/01 23:55:22 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -103,7 +103,7 @@ ivl: $O
 	$(CXX) $(CXXFLAGS) -o ivl $O
 
 iverilog: iverilog.c
-	$(CC) $(CPPFLAGS) -o iverilog -DIVL_ROOT='"@libdir@/ivl"' iverilog.c
+	$(CC) $(CPPFLAGS) -o iverilog -DCXX='"@CXX@"' -DIVL_ROOT='"@libdir@/ivl"'  -DIVL_INC='"@includedir@"' -DIVL_LIB='"@libdir@"' -DDLLIB='"@DLLIB@"' iverilog.c
 
 %.o dep/%.d: %.cc
 	@[ -d dep ] || mkdir dep
diff --git a/iverilog.c b/iverilog.c
index 1f159266d..7e42d4a66 100644
--- a/iverilog.c
+++ b/iverilog.c
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT)
-#ident "$Id: iverilog.c,v 1.7 2000/04/29 01:20:14 steve Exp $"
+#ident "$Id: iverilog.c,v 1.8 2000/05/01 23:55:22 steve Exp $"
 #endif
 
 #include <stdio.h>
@@ -124,8 +124,9 @@ static int t_vvm(char*cmd, unsigned ncmd)
 	    return rc;
       }
 
-      sprintf(tmp, "g++ -O -rdynamic -fno-exceptions -o %s -I%s "
-	      "-L%s %s.cc -lvvm -ldl", opath, base, base, opath);
+      sprintf(tmp, "%s -O -rdynamic -fno-exceptions -o %s -I%s "
+	      "-L%s %s.cc -lvvm -ldl", CXX, opath, IVL_INC, IVL_LIB,
+	      opath, DLLIB);
 
       if (verbose_flag)
 	    printf("compile: %s\n", tmp);
@@ -287,6 +288,9 @@ int main(int argc, char **argv)
 
 /*
  * $Log: iverilog.c,v $
+ * Revision 1.8  2000/05/01 23:55:22  steve
+ *  Better inc and lib paths for iverilog.
+ *
  * Revision 1.7  2000/04/29 01:20:14  steve
  *  The -f flag is now in place.
  *