From 5660e0ed8b2b26a0a3e8f388ebf60e9e53eb0817 Mon Sep 17 00:00:00 2001 From: Stephen Williams Date: Tue, 25 Nov 2008 16:38:09 -0800 Subject: [PATCH] Install header files in includedir/iverilog Move the header files from includedir/verilog to .../iverilog because the verilog name is a little too generic. The iverilog-vpi command should handle the changes. --- Makefile.in | 2 +- driver-vpi/main.c | 2 +- verilog.spec | 13 ++++++++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile.in b/Makefile.in index 8c2d66107..3c8f80083 100644 --- a/Makefile.in +++ b/Makefile.in @@ -60,7 +60,7 @@ bindir = @bindir@ libdir = @libdir@ # This is actually the directory where we install our own header files. # It is a little different from the generic includedir. -includedir = @includedir@/verilog$(suffix) +includedir = @includedir@/iverilog$(suffix) mandir = @mandir@ dllib=@DLLIB@ diff --git a/driver-vpi/main.c b/driver-vpi/main.c index c4b503d4e..54b05c5b4 100644 --- a/driver-vpi/main.c +++ b/driver-vpi/main.c @@ -514,7 +514,7 @@ static void setup_ivl_environment() assign(&gstr.pCFLAGS,IVERILOG_VPI_CFLAGS " -I"); append(&gstr.pCFLAGS,gstr.pIVL); appendBackSlash(&gstr.pCFLAGS); - append(&gstr.pCFLAGS,"\\include\\\\verilog" IVERILOG_SUFFIX); + append(&gstr.pCFLAGS,"\\include\\\\iverilog" IVERILOG_SUFFIX); /* Build up the LDFLAGS option string */ assign(&gstr.pLDLIBS,"-L"); diff --git a/verilog.spec b/verilog.spec index b4492160a..846c7eca1 100644 --- a/verilog.spec +++ b/verilog.spec @@ -76,13 +76,16 @@ rm -rf $RPM_BUILD_ROOT %attr(-,root,root) %{_libdir}/libveriuser.a %attr(-,root,root) %{_libdir}/ivl/include/constants.vams %attr(-,root,root) %{_libdir}/ivl/include/disciplines.vams -%attr(-,root,root) /usr/include/verilog/ivl_target.h -%attr(-,root,root) /usr/include/verilog/vpi_user.h -%attr(-,root,root) /usr/include/verilog/acc_user.h -%attr(-,root,root) /usr/include/verilog/veriuser.h -%attr(-,root,root) /usr/include/verilog/_pli_types.h +%attr(-,root,root) /usr/include/iverilog/ivl_target.h +%attr(-,root,root) /usr/include/iverilog/vpi_user.h +%attr(-,root,root) /usr/include/iverilog/acc_user.h +%attr(-,root,root) /usr/include/iverilog/veriuser.h +%attr(-,root,root) /usr/include/iverilog/_pli_types.h %changelog -n verilog +* Tue Nov 25 2008 - steve@icarus.com +- Move header files frim /verilog/ to /iverilog/ + * Tue Nov 18 2008 - steve@icarus.com - New snapshot 20080905