From 969426a21e13921263cc9eeca0769d0192bbe6d3 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Wed, 12 Feb 2020 22:34:10 +0800 Subject: [PATCH] Fix install missing file bug in PR #300 When installing tgt-stub and tgt-vhdl, due to the wrong target path, the install scripts can't find the file to be installed. The missing file is: stub.conf, stub-s.conf, vhdl.conf, vhdl-s.conf Changed to right path fixed this problem. Thanks @minux help to fix. Signed-off-by: Huang Rui --- tgt-stub/Makefile.in | 8 ++++---- tgt-vhdl/Makefile.in | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tgt-stub/Makefile.in b/tgt-stub/Makefile.in index 8be486b2d..933407001 100644 --- a/tgt-stub/Makefile.in +++ b/tgt-stub/Makefile.in @@ -85,13 +85,13 @@ stub.tgt: $O $(TGTDEPLIBS) install: all installdirs installfiles F = ./stub.tgt \ - ./stub.conf \ - ./stub-s.conf + $(srcdir)/stub.conf \ + $(srcdir)/stub-s.conf installfiles: $(F) installdirs $(INSTALL_PROGRAM) ./stub.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/stub.tgt" - $(INSTALL_DATA) ./stub.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/stub.conf" - $(INSTALL_DATA) ./stub-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/stub-s.conf" + $(INSTALL_DATA) $(srcdir)/stub.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/stub.conf" + $(INSTALL_DATA) $(srcdir)/stub-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/stub-s.conf" installdirs: $(srcdir)/../mkinstalldirs $(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl$(suffix)" diff --git a/tgt-vhdl/Makefile.in b/tgt-vhdl/Makefile.in index c8ce6a855..3c7fdb303 100644 --- a/tgt-vhdl/Makefile.in +++ b/tgt-vhdl/Makefile.in @@ -93,13 +93,13 @@ vhdl_config.h: stamp-vhdl_config-h install: all installdirs installfiles F = ./vhdl.tgt \ - ./vhdl.conf \ - ./vhdl-s.conf + $(srcdir)/vhdl.conf \ + $(srcdir)/vhdl-s.conf installfiles: $(F) installdirs $(INSTALL_PROGRAM) ./vhdl.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.tgt" - $(INSTALL_DATA) ./vhdl.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.conf" - $(INSTALL_DATA) ./vhdl-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl-s.conf" + $(INSTALL_DATA) $(srcdir)/vhdl.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.conf" + $(INSTALL_DATA) $(srcdir)/vhdl-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl-s.conf" installdirs: $(srcdir)/../mkinstalldirs $(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl$(suffix)"