From e6bd08898496ab95f82ec012caa64d5c2f59941c Mon Sep 17 00:00:00 2001
From: steve <steve>
Date: Sun, 23 Jan 2000 23:54:36 +0000
Subject: [PATCH]  Compile time problems with vpi_user.h

---
 Makefile.in           | 5 +++--
 vpi/Makefile.in       | 4 ++--
 vpi/sys_readmem.c     | 7 +++++--
 vpi/sys_readmem_lex.h | 7 +++++--
 vpi/sys_vcd.c         | 7 +++++--
 vvm/Makefile.in       | 4 ++--
 6 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index eef853755..12975fb82 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.34 2000/01/09 17:43:28 steve Exp $"
+#ident "$Id: Makefile.in,v 1.35 2000/01/23 23:54:36 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -39,6 +39,7 @@ includedir = $(prefix)/include
 CC = @CC@
 CXX = @CXX@
 INSTALL = @INSTALL@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 STRIP = @STRIP@
@@ -122,7 +123,7 @@ install: all installdirs $(bindir)/verilog $(bindir)/gverilog $(libdir)/ivl/ivl
 	cd ivlpp ; $(MAKE) install
 
 $(bindir)/verilog: ./verilog
-	$(INSTALL_PROGRAM) ./verilog $(bindir)/verilog
+	$(INSTALL_SCRIPT) ./verilog $(bindir)/verilog
 
 $(bindir)/gverilog: ./gverilog
 	$(INSTALL_PROGRAM) ./gverilog $(bindir)/gverilog
diff --git a/vpi/Makefile.in b/vpi/Makefile.in
index c46632128..8d7ba2396 100644
--- a/vpi/Makefile.in
+++ b/vpi/Makefile.in
@@ -18,7 +18,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.8 1999/12/15 04:01:14 steve Exp $"
+#ident "$Id: Makefile.in,v 1.9 2000/01/23 23:54:36 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -68,7 +68,7 @@ install: all installdirs $(libdir)/ivl/system.vpi \
 	$(includedir)/vpi_user.h
 
 $(libdir)/ivl/system.vpi: ./system.vpi
-	$(INSTALL_PROGRAM) ./system.vpi $(libdir)/ivl/system.vpi
+	$(INSTALL_DATA) ./system.vpi $(libdir)/ivl/system.vpi
 
 $(includedir)/vpi_user.h: $(srcdir)/vpi_user.h
 	$(INSTALL_DATA) $(srcdir)/vpi_user.h $(includedir)/vpi_user.h
diff --git a/vpi/sys_readmem.c b/vpi/sys_readmem.c
index 8e300dc0a..53c020ac0 100644
--- a/vpi/sys_readmem.c
+++ b/vpi/sys_readmem.c
@@ -17,10 +17,10 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT)
-#ident "$Id: sys_readmem.c,v 1.3 1999/12/15 04:35:34 steve Exp $"
+#ident "$Id: sys_readmem.c,v 1.4 2000/01/23 23:54:36 steve Exp $"
 #endif
 
-# include  <vpi_user.h>
+# include  "vpi_user.h"
 # include  <string.h>
 # include  <stdlib.h>
 # include  <stdio.h>
@@ -143,6 +143,9 @@ void sys_readmem_register()
 
 /*
  * $Log: sys_readmem.c,v $
+ * Revision 1.4  2000/01/23 23:54:36  steve
+ *  Compile time problems with vpi_user.h
+ *
  * Revision 1.3  1999/12/15 04:35:34  steve
  *  Add readmemb.
  *
diff --git a/vpi/sys_readmem_lex.h b/vpi/sys_readmem_lex.h
index 67a238fe4..39667685b 100644
--- a/vpi/sys_readmem_lex.h
+++ b/vpi/sys_readmem_lex.h
@@ -19,11 +19,11 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT)
-#ident "$Id: sys_readmem_lex.h,v 1.1 1999/12/15 04:01:14 steve Exp $"
+#ident "$Id: sys_readmem_lex.h,v 1.2 2000/01/23 23:54:36 steve Exp $"
 #endif
 
 # include  <stdio.h>
-# include  <vpi_user.h>
+# include  "vpi_user.h"
 
 # define MEM_ADDRESS 257
 # define MEM_WORD    258
@@ -34,6 +34,9 @@ extern int readmemlex();
 
 /*
  * $Log: sys_readmem_lex.h,v $
+ * Revision 1.2  2000/01/23 23:54:36  steve
+ *  Compile time problems with vpi_user.h
+ *
  * Revision 1.1  1999/12/15 04:01:14  steve
  *  Add the VPI implementation of $readmemh.
  *
diff --git a/vpi/sys_vcd.c b/vpi/sys_vcd.c
index 179a17ae8..7685964a8 100644
--- a/vpi/sys_vcd.c
+++ b/vpi/sys_vcd.c
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #if !defined(WINNT)
-#ident "$Id: sys_vcd.c,v 1.4 2000/01/20 06:04:55 steve Exp $"
+#ident "$Id: sys_vcd.c,v 1.5 2000/01/23 23:54:36 steve Exp $"
 #endif
 
 /*
@@ -25,7 +25,7 @@
  * funcitons.
  */
 
-# include  <vpi_user.h>
+# include  "vpi_user.h"
 # include  <stdio.h>
 # include  <stdlib.h>
 # include  <string.h>
@@ -257,6 +257,9 @@ void sys_vcd_register()
 
 /*
  * $Log: sys_vcd.c,v $
+ * Revision 1.5  2000/01/23 23:54:36  steve
+ *  Compile time problems with vpi_user.h
+ *
  * Revision 1.4  2000/01/20 06:04:55  steve
  *  $dumpall checkpointing in VCD dump.
  *
diff --git a/vvm/Makefile.in b/vvm/Makefile.in
index 83cead301..1a1f3722a 100644
--- a/vvm/Makefile.in
+++ b/vvm/Makefile.in
@@ -18,7 +18,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.16 2000/01/13 03:35:35 steve Exp $"
+#ident "$Id: Makefile.in,v 1.17 2000/01/23 23:54:36 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -84,7 +84,7 @@ install: all installdirs $(libdir)/libvvm.a \
 	$(includedir)/vvm_calltf.h
 
 $(libdir)/libvvm.a: ./libvvm.a
-	$(INSTALL_PROGRAM) ./libvvm.a $(libdir)/libvvm.a
+	$(INSTALL_DATA) ./libvvm.a $(libdir)/libvvm.a
 
 $(includedir)/vvm.h: $(srcdir)/vvm.h
 	$(INSTALL_DATA) $(srcdir)/vvm.h $(includedir)/vvm.h