From 4ba552ec163574ff25fef6b4134e0c77342fcc53 Mon Sep 17 00:00:00 2001 From: Mohammad Akhlaghi Date: Mon, 14 Jan 2019 18:15:01 +0000 Subject: Links to the built libncursesw corrected after its build In a previous implementation, we were using a `target' variable to define the final target of several links, but with the new `sov' solution, we just used its base name. However, we had forgot to correct two instances of `target'. This is corrected now. Also, the step to clean all already built outputs of the NCURSES library has been simplified to a platform independent wildcard. --- reproduce/src/make/dependencies-basic.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/reproduce/src/make/dependencies-basic.mk b/reproduce/src/make/dependencies-basic.mk index 80f6e1a..0c20f15 100644 --- a/reproduce/src/make/dependencies-basic.mk +++ b/reproduce/src/make/dependencies-basic.mk @@ -338,9 +338,7 @@ $(ilidir)/ncurses: $(tdir)/ncurses-$(ncurses-version).tar.gz \ # Delete the library that will be installed (so we can make sure # the build process completed afterwards and reset the links). - if [ x$(on_mac_os) = xyes ]; then rm -f $(ildir)/libncursesw*dylib;\ - else rm -f $(ildir)/libncursesw.so*; \ - fi + rm -f $(ildir)/libncursesw* # Standard build process. $(call gbuild, $<, ncurses-$(ncurses-version), static, \ @@ -403,8 +401,8 @@ $(ilidir)/ncurses: $(tdir)/ncurses-$(ncurses-version).tar.gz \ ln -fs libncursesw.$$sov lib$$lib.$$sov; \ ln -fs pkgconfig/ncursesw.pc pkgconfig/$$lib.pc; \ done; \ - ln -fs $$target libcurses.$$so; \ - ln -fs $$target libcursesw.$$sov; \ + ln -fs libncursesw.$$sov libcurses.$$so; \ + ln -fs libncursesw.$$sov libcursesw.$$sov; \ ln -fs pkgconfig/ncursesw.pc pkgconfig/curses.pc; \ ln -fs pkgconfig/ncursesw.pc pkgconfig/cursesw.pc; \ \ -- cgit v1.2.1