From e67952240b558786c2405b10b499583c33ef5a0d Mon Sep 17 00:00:00 2001
From: steve <steve>
Date: Fri, 3 Dec 1999 17:43:49 +0000
Subject: [PATCH]  Installation fixes for Debian.

---
 Makefile.in       | 18 +++++++++---------
 ivlpp/Makefile.in |  9 +++++----
 verilog.sh        | 15 +++++++--------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 44289de00..cfdc876e4 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.30 1999/11/29 17:02:21 steve Exp $"
+#ident "$Id: Makefile.in,v 1.24.2.1 1999/12/03 17:43:49 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -66,10 +66,10 @@ distclean: clean
 	rm -f Makefile
 
 TT = t-null.o t-verilog.o t-vvm.o t-xnf.o
-FF = nobufz.o nodangle.o propinit.o sigfold.o synth.o xnfio.o xnfsyn.o
+FF = nobufz.o propinit.o sigfold.o xnfio.o xnfsyn.o
 
-O = main.o cprop.o design_dump.o dup_expr.o elaborate.o elab_expr.o \
-elab_net.o emit.o eval.o eval_tree.o expr_synth.o functor.o \
+O = main.o cprop.o design_dump.o elaborate.o elab_expr.o emit.o eval.o \
+eval_tree.o functor.o \
 lexor.o lexor_keyword.o mangle.o netlist.o pad_to_width.o \
 parse.o parse_misc.o pform.o pform_dump.o \
 set_width.o \
@@ -98,7 +98,7 @@ ivl: $O
 
 %.o dep/%.d: %.cc
 	@[ -d dep ] || mkdir dep
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -MD -c $< -o $*.o
+	$(CXX) $(CXXFLAGS) -MD -c $< -o $*.o
 	mv $*.d dep/$*.d
 
 
@@ -113,7 +113,7 @@ parse.h parse.cc: $(srcdir)/parse.y
 lexor.cc: $(srcdir)/lexor.lex
 	flex -PVL -s -olexor.cc $(srcdir)/lexor.lex
 
-install: all installdirs $(bindir)/verilog $(bindir)/ivl $(mandir)/man1/verilog.1
+install: all installdirs $(bindir)/verilog $(libdir)/ivl/ivl $(mandir)/man1/verilog.1
 	cd vpi ; $(MAKE) install
 	cd vvm ; $(MAKE) install
 	cd ivlpp ; $(MAKE) install
@@ -121,9 +121,9 @@ install: all installdirs $(bindir)/verilog $(bindir)/ivl $(mandir)/man1/verilog.
 $(bindir)/verilog: ./verilog
 	$(INSTALL_PROGRAM) ./verilog $(bindir)/verilog
 
-$(bindir)/ivl: ivl
-	$(INSTALL_PROGRAM) ./ivl $(bindir)/ivl
-	$(STRIP) $(bindir)/ivl
+$(libdir)/ivl/ivl: ivl
+	$(INSTALL_PROGRAM) ./ivl $(libdir)/ivl/ivl
+	$(STRIP) $(libdir)/ivl/ivl
 
 $(mandir)/man1/verilog.1: $(srcdir)/verilog.1
 	$(INSTALL_DATA) $(srcdir)/verilog.1 $(mandir)/man1/verilog.1
diff --git a/ivlpp/Makefile.in b/ivlpp/Makefile.in
index 27de548ce..a083e3c4e 100644
--- a/ivlpp/Makefile.in
+++ b/ivlpp/Makefile.in
@@ -18,7 +18,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.6 1999/10/16 20:48:15 steve Exp $"
+#ident "$Id: Makefile.in,v 1.6.2.1 1999/12/03 17:43:49 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -33,6 +33,7 @@ VPATH = $(srcdir)
 
 bindir = $(exec_prefix)/bin
 libdir = $(exec_prefix)/lib
+libexecdir = $(libdir)/ivl
 includedir = $(prefix)/include
 
 CC = @CC@
@@ -60,10 +61,10 @@ lexor.c: lexor.lex
 parse.h parse.c: parse.y
 	bison --verbose -t -d parse.y -o parse.c
 
-install: all installdirs $(bindir)/ivlpp
+install: all installdirs $(libexecdir)/ivlpp
 
-$(bindir)/ivlpp: ivlpp
-	$(INSTALL_PROGRAM) ./ivlpp $(bindir)/ivlpp
+$(libexecdir)/ivlpp: ivlpp
+	$(INSTALL_PROGRAM) ./ivlpp $(libexecdir)/ivlpp
 
 installdirs: ../mkinstalldirs
 	$(srcdir)/../mkinstalldirs $(bindir)
diff --git a/verilog.sh b/verilog.sh
index 43e10a337..ed74033b1 100644
--- a/verilog.sh
+++ b/verilog.sh
@@ -21,7 +21,7 @@
 # Added support for functors, especially for the XNF target. <steve@icarus.com>
 
 # Setup variables
-execPath=@bindir@
+execPath=@libdir@/ivl
 execIVLPP=${execPath}/ivlpp
 execIVL=${execPath}/ivl
 execCpp=@CXX@
@@ -40,10 +40,11 @@ functors=""
 flags=""
 
 # If VPI module path aren't set up, warn at least
-#if test -z "${VPI_MODULE_PATH}" ; then
-#    echo "Missing environment variable VPI_MODULE_PATH.";
-#    echo "To be able to execute, set VPI_MODULE_PATH to ${VPIModulePath}";
-#fi
+if test -z "${VPI_MODULE_PATH}" ; then
+    echo "Warning: Missing environment variable VPI_MODULE_PATH.";
+    echo "To be able to execute, set VPI_MODULE_PATH to ${VPIModulePath}";
+    export VPI_MODULE_PATH=${VPIModulePath}
+fi
 
 # Try to extract given parameters
 parameter=`getopt D:I:Xxf:o:s:t: "$@"` 
@@ -68,8 +69,6 @@ done
 # The rest is filenames
 verilogFile=$@;
 
-flags="$flags -fVPI_MODULE_PATH=${VPIModulePath}"
-
 if test -z "${verilogFile}" ; then
     echo "Missing infile";
     echo "verilog [-Dmacro[=defn]] [-Iincludepath] [-X] [-x] [-o outputfilename] [-s topmodule] sourcefile[s]" ;
@@ -80,7 +79,7 @@ fi
 case "$target" in
  vvm) targetSuffix="" ;;
  xnf) targetSuffix=".xnf"
-      functors="-Fsynth -Fnodangle -Fxnfio" ;;
+      functors="-Fxnfsyn -Fsigfold -Fxnfio" ;;
    *) targetSuffix=".$target" ;;
 esac