From 0602ef46c6bbd8350597a678edb7e8f576906063 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sat, 18 Jan 2020 15:13:13 +0800 Subject: [PATCH] [17/20]driver/Makefile.in:fix install timestamp check Fix tgt-fpga/Makefile.in vvp/Makefile.in doc Fix bug: https://bugs.gentoo.org/705412 Fix bug: https://github.com/gentoo/gentoo/pull/14096 Related: https://github.com/steveicarus/iverilog/pull/294 Signed-off-by: Huang Rui --- driver/Makefile.in | 21 ++++++++++++--------- tgt-fpga/Makefile.in | 4 ++-- vvp/Makefile.in | 4 ++-- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/driver/Makefile.in b/driver/Makefile.in index 7ec46f529..515e17e09 100644 --- a/driver/Makefile.in +++ b/driver/Makefile.in @@ -112,32 +112,35 @@ iverilog.pdf: iverilog.ps ifeq (@MINGW32@,yes) ifeq ($(MAN),none) -INSTALL_DOC = $(mandir)/man1/iverilog$(suffix).1 +INSTALL_DOC = installman else ifeq ($(PS2PDF),none) -INSTALL_DOC = $(mandir)/man1/iverilog$(suffix).1 +INSTALL_DOC = installman else -INSTALL_DOC = $(prefix)/iverilog$(suffix).pdf $(mandir)/man1/iverilog$(suffix).1 +INSTALL_DOC = installpdf installman all: iverilog.pdf endif endif INSTALL_DOCDIR = $(mandir)/man1 else -INSTALL_DOC = $(mandir)/man1/iverilog$(suffix).1 +INSTALL_DOC = installman INSTALL_DOCDIR = $(mandir)/man1 endif -install: all installdirs $(bindir)/iverilog$(suffix)@EXEEXT@ $(INSTALL_DOC) +install: all installdirs installfiles -$(bindir)/iverilog$(suffix)@EXEEXT@: ./iverilog@EXEEXT@ - $(INSTALL_PROGRAM) ./iverilog@EXEEXT@ "$(DESTDIR)$(bindir)/iverilog$(suffix)@EXEEXT@" +F = ./iverilog@EXEEXT@ \ + $(INSTALL_DOC) -$(mandir)/man1/iverilog$(suffix).1: iverilog.man +installman: iverilog.man installdirs $(INSTALL_DATA) iverilog.man "$(DESTDIR)$(mandir)/man1/iverilog$(suffix).1" -$(prefix)/iverilog$(suffix).pdf: iverilog.pdf +installpdf: iverilog.pdf installdirs $(INSTALL_DATA) iverilog.pdf "$(DESTDIR)$(prefix)/iverilog$(suffix).pdf" +installfiles: $(F) installdirs + $(INSTALL_PROGRAM) ./iverilog@EXEEXT@ "$(DESTDIR)$(bindir)/iverilog$(suffix)@EXEEXT@" + installdirs: $(srcdir)/../mkinstalldirs $(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(INSTALL_DOCDIR)" diff --git a/tgt-fpga/Makefile.in b/tgt-fpga/Makefile.in index 6154cbe9d..6170d4c28 100644 --- a/tgt-fpga/Makefile.in +++ b/tgt-fpga/Makefile.in @@ -108,10 +108,10 @@ F = ./fpga.tgt \ $(srcdir)/fpga-s.conf \ $(INSTALL_DOC) -installman: installdirs +installman: $(srcdir)/iverilog-fpga.man installdirs $(INSTALL_DATA) $(srcdir)/iverilog-fpga.man "$(DESTDIR)$(mandir)/man1/iverilog-fpga$(suffix).1" -installpdf: installdirs +installpdf: iverilog-fpga.pdf installdirs $(INSTALL_DATA) iverilog-fpga.pdf "$(DESTDIR)$(prefix)/iverilog-fpga$(suffix).pdf" installfiles: $(F) installdirs diff --git a/vvp/Makefile.in b/vvp/Makefile.in index 709d64456..64759e2e7 100644 --- a/vvp/Makefile.in +++ b/vvp/Makefile.in @@ -186,10 +186,10 @@ install: all installdirs installfiles F = ./vvp@EXEEXT@ $(INSTALL_DOC) -installman: installdirs +installman: vvp.man installdirs $(INSTALL_DATA) vvp.man "$(DESTDIR)$(mandir)/man1/vvp$(suffix).1" -installpdf: installdirs +installpdf: vvp.pdf installdirs $(INSTALL_DATA) vvp.pdf "$(DESTDIR)$(prefix)/vvp$(suffix).pdf" installfiles: $(F) installdirs