diff --git a/Makefile.in b/Makefile.in index 6a5e3fd90..a603a5996 100644 --- a/Makefile.in +++ b/Makefile.in @@ -223,40 +223,40 @@ install: all installdirs $(libdir)/ivl/ivl@EXEEXT@ $(libdir)/ivl/include/consta do (cd $$dir ; $(MAKE) $@); done $(bindir)/iverilog-vpi: ./iverilog-vpi - $(INSTALL_SCRIPT) ./iverilog-vpi $(bindir)/iverilog-vpi + $(INSTALL_SCRIPT) ./iverilog-vpi $(DESTDIR)$(bindir)/iverilog-vpi $(libdir)/ivl/ivl@EXEEXT@: ./ivl@EXEEXT@ - $(INSTALL_PROGRAM) ./ivl@EXEEXT@ $(libdir)/ivl/ivl@EXEEXT@ + $(INSTALL_PROGRAM) ./ivl@EXEEXT@ $(DESTDIR)$(libdir)/ivl/ivl@EXEEXT@ $(libdir)/ivl/include/constants.vams: $(srcdir)/constants.vams $(INSTALL_DATA) $(srcdir)/constants.vams $@ $(libdir)/ivl/xnf-s.conf: $(srcdir)/xnf-s.conf - $(INSTALL_DATA) $(srcdir)/xnf-s.conf $(libdir)/ivl/xnf-s.conf + $(INSTALL_DATA) $(srcdir)/xnf-s.conf $(DESTDIR)$(libdir)/ivl/xnf-s.conf $(libdir)/ivl/xnf.conf: $(srcdir)/xnf.conf - $(INSTALL_DATA) $(srcdir)/xnf.conf $(libdir)/ivl/xnf.conf + $(INSTALL_DATA) $(srcdir)/xnf.conf $(DESTDIR)$(libdir)/ivl/xnf.conf $(includedir)/ivl_target.h: $(srcdir)/ivl_target.h - $(INSTALL_DATA) $(srcdir)/ivl_target.h $(includedir)/ivl_target.h + $(INSTALL_DATA) $(srcdir)/ivl_target.h $(DESTDIR)$(includedir)/ivl_target.h $(includedir)/_pli_types.h: _pli_types.h - $(INSTALL_DATA) $< $(includedir)/_pli_types.h + $(INSTALL_DATA) $< $(DESTDIR)$(includedir)/_pli_types.h $(includedir)/vpi_user.h: $(srcdir)/vpi_user.h - $(INSTALL_DATA) $(srcdir)/vpi_user.h $(includedir)/vpi_user.h + $(INSTALL_DATA) $(srcdir)/vpi_user.h $(DESTDIR)$(includedir)/vpi_user.h $(includedir)/acc_user.h: $(srcdir)/acc_user.h - $(INSTALL_DATA) $(srcdir)/acc_user.h $(includedir)/acc_user.h + $(INSTALL_DATA) $(srcdir)/acc_user.h $(DESTDIR)$(includedir)/acc_user.h $(includedir)/veriuser.h: $(srcdir)/veriuser.h - $(INSTALL_DATA) $(srcdir)/veriuser.h $(includedir)/veriuser.h + $(INSTALL_DATA) $(srcdir)/veriuser.h $(DESTDIR)$(includedir)/veriuser.h $(mandir)/man1/iverilog-vpi.1: $(srcdir)/iverilog-vpi.man - $(INSTALL_DATA) $(srcdir)/iverilog-vpi.man $(mandir)/man1/iverilog-vpi.1 + $(INSTALL_DATA) $(srcdir)/iverilog-vpi.man $(DESTDIR)$(mandir)/man1/iverilog-vpi.1 $(prefix)/iverilog-vpi.pdf: iverilog-vpi.pdf - $(INSTALL_DATA) iverilog-vpi.pdf $(prefix)/iverilog-vpi.pdf + $(INSTALL_DATA) iverilog-vpi.pdf $(DESTDIR)$(prefix)/iverilog-vpi.pdf # In windows installations, put a few examples and the quick_start # into the destination directory. @@ -279,22 +279,22 @@ $(prefix)/QUICK_START.txt: $(srcdir)/QUICK_START.txt endif installdirs: mkinstalldirs - $(srcdir)/mkinstalldirs $(bindir) $(includedir) $(libdir)/ivl \ - $(libdir)/ivl/include $(mandir) $(mandir)/man1 + $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/ivl \ + $(DESTDIR)$(libdir)/ivl/include $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1 uninstall: for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) $@); done for dir in vpi ivlpp driver; \ do (cd $$dir ; $(MAKE) $@); done for f in xnf.conf xnf-s.conf ivl@EXEEXT@ include/constants.vams; \ - do rm -f $(libdir)/ivl/$$f; done - -rmdir $(libdir)/ivl/include - -rmdir $(libdir)/ivl + do rm -f $(DESTDIR)$(libdir)/ivl/$$f; done + -rmdir $(DESTDIR)$(libdir)/ivl/include + -rmdir $(DESTDIR)$(libdir)/ivl for f in verilog iverilog-vpi gverilog@EXEEXT@; \ - do rm -f $(bindir)/$$f; done + do rm -f $(DESTDIR)$(bindir)/$$f; done for f in ivl_target.h vpi_user.h _pli_types.h acc_user.h veriuser.h; \ - do rm -f $(includedir)/$$f; done - rm -f $(mandir)/man1/iverilog-vpi.1 $(prefix)/iverilog-vpi.pdf + do rm -f $(DESTDIR)$(includedir)/$$f; done + rm -f $(DESTDIR)$(mandir)/man1/iverilog-vpi.1 $(DESTDIR)$(prefix)/iverilog-vpi.pdf -include $(patsubst %.o, dep/%.d, $O) diff --git a/verilog.spec b/verilog.spec index f0f017a29..2676cab14 100644 --- a/verilog.spec +++ b/verilog.spec @@ -1,10 +1,15 @@ +#norootforbuild +# +%define rev_date 20080429 +# +# Summary: Icarus Verilog Name: verilog -Version: 0.9.0.20080429 +Version: 0.9.0.%{rev_date} Release: 0 License: GPL Group: Productivity/Scientific/Electronics -Source: verilog-20080429.tar.gz +Source: verilog-%{rev_date}.tar.gz URL: http://www.icarus.com/eda/verilog/index.html Packager: Stephen Williams @@ -22,14 +27,14 @@ engineering formats, including simulation. It strives to be true to the IEEE-1364 standard. %prep -%setup -n verilog-20080429 +%setup -n verilog-%{rev_date} %build -./configure --prefix=/usr --mandir='$(prefix)/share/man' +%{configure} make CXXFLAGS=-O %install -make prefix=$RPM_BUILD_ROOT/usr install +%{makeinstall} %clean rm -rf $RPM_BUILD_ROOT @@ -39,35 +44,35 @@ rm -rf $RPM_BUILD_ROOT %attr(-,root,root) %doc COPYING README.txt BUGS.txt QUICK_START.txt ieee1364-notes.txt mingw.txt swift.txt netlist.txt t-dll.txt vpi.txt xnf.txt tgt-fpga/fpga.txt cadpli/cadpli.txt xilinx-hint.txt %attr(-,root,root) %doc examples/* -%attr(-,root,root) /usr/share/man/man1/iverilog.1.gz +%attr(-,root,root) %{_mandir}/man1/iverilog.1.gz #%attr(-,root,root) /usr/man/man1/iverilog-fpga.1.gz -%attr(-,root,root) /usr/share/man/man1/iverilog-vpi.1.gz -%attr(-,root,root) /usr/share/man/man1/vvp.1.gz +%attr(-,root,root) %{_mandir}/man1/iverilog-vpi.1.gz +%attr(-,root,root) %{_mandir}/man1/vvp.1.gz -%attr(-,root,root) /usr/bin/iverilog -%attr(-,root,root) /usr/bin/iverilog-vpi -%attr(-,root,root) /usr/bin/vvp -%attr(-,root,root) /usr/lib/ivl/ivl -%attr(-,root,root) /usr/lib/ivl/ivlpp -%attr(-,root,root) /usr/lib/ivl/null.tgt -%attr(-,root,root) /usr/lib/ivl/null.conf -%attr(-,root,root) /usr/lib/ivl/null-s.conf -%attr(-,root,root) /usr/lib/ivl/stub.tgt -%attr(-,root,root) /usr/lib/ivl/stub.conf -%attr(-,root,root) /usr/lib/ivl/stub-s.conf -%attr(-,root,root) /usr/lib/ivl/vvp.tgt -%attr(-,root,root) /usr/lib/ivl/vvp.conf -%attr(-,root,root) /usr/lib/ivl/vvp-s.conf -#%attr(-,root,root) /usr/lib/ivl/fpga.tgt -#%attr(-,root,root) /usr/lib/ivl/fpga.conf -#%attr(-,root,root) /usr/lib/ivl/fpga-s.conf -#%attr(-,root,root) /usr/lib/ivl/xnf.conf -#%attr(-,root,root) /usr/lib/ivl/xnf-s.conf -%attr(-,root,root) /usr/lib/ivl/system.sft -%attr(-,root,root) /usr/lib/ivl/system.vpi -%attr(-,root,root) /usr/lib/ivl/cadpli.vpl -%attr(-,root,root) /usr/lib/libvpi.a -%attr(-,root,root) /usr/lib/libveriuser.a +%attr(-,root,root) %{_bindir}/iverilog +%attr(-,root,root) %{_bindir}/iverilog-vpi +%attr(-,root,root) %{_bindir}/vvp +%attr(-,root,root) %{_libdir}/ivl/ivl +%attr(-,root,root) %{_libdir}/ivl/ivlpp +%attr(-,root,root) %{_libdir}/ivl/null.tgt +%attr(-,root,root) %{_libdir}/ivl/null.conf +%attr(-,root,root) %{_libdir}/ivl/null-s.conf +%attr(-,root,root) %{_libdir}/ivl/stub.tgt +%attr(-,root,root) %{_libdir}/ivl/stub.conf +%attr(-,root,root) %{_libdir}/ivl/stub-s.conf +%attr(-,root,root) %{_libdir}/ivl/vvp.tgt +%attr(-,root,root) %{_libdir}/ivl/vvp.conf +%attr(-,root,root) %{_libdir}/ivl/vvp-s.conf +#%attr(-,root,root) %{_libdir}/ivl/fpga.tgt +#%attr(-,root,root) %{_libdir}/ivl/fpga.conf +#%attr(-,root,root) %{_libdir}/ivl/fpga-s.conf +#%attr(-,root,root) %{_libdir}/ivl/xnf.conf +#%attr(-,root,root) %{_libdir}/ivl/xnf-s.conf +%attr(-,root,root) %{_libdir}/ivl/system.sft +%attr(-,root,root) %{_libdir}/ivl/system.vpi +%attr(-,root,root) %{_libdir}/ivl/cadpli.vpl +%attr(-,root,root) %{_libdir}/libvpi.a +%attr(-,root,root) %{_libdir}/libveriuser.a %attr(-,root,root) /usr/include/ivl_target.h %attr(-,root,root) /usr/include/vpi_user.h %attr(-,root,root) /usr/include/acc_user.h