From b835c158f3cf3b6525e734c0f0468d000b19005a Mon Sep 17 00:00:00 2001 From: Mohammad Akhlaghi Date: Mon, 22 Apr 2019 17:12:32 +0100 Subject: High-level software now specified in TARGETS.mk Until now, to specify which high-level software you want the project to contain, it was necessary to go into the `high-level.mk' Makefile that is complicated and can create bugs. With this commit, a new `reproduce/software/config/installation/TARGETS.mk' file has been created that is easily/cleanly in charge of documenting the final high-level software that must be built for the project. Also, until now, FFTW was set as a dependency of Numpy while we couldn't actually get Numpy to use it! It was just there for future reference and to justify its build rule. But now that many software won't be built and there is no problem with having rules even though a project might not use them, it has been removed. --- configure | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 55ce4dc..a71c815 100755 --- a/configure +++ b/configure @@ -643,12 +643,9 @@ if ! [ -d $tmpblddir ]; then mkdir $tmpblddir; fi verdir=$instdir/version-info if ! [ -d $verdir ]; then mkdir $verdir; fi -ibidir=$verdir/bin +ibidir=$verdir/proglib if ! [ -d $ibidir ]; then mkdir $ibidir; fi -ilidir=$verdir/lib -if ! [ -d $ilidir ]; then mkdir $ilidir; fi - ipydir=$verdir/python if ! [ -d $ipydir ]; then mkdir $ipydir; fi @@ -1082,7 +1079,7 @@ function prepare_name_version() { # Report the different software in separate contexts (separating Python and # TeX packages from the C/C++ programs and libraries). -proglibs=$(prepare_name_version $verdir/bin/* $verdir/lib/*) +proglibs=$(prepare_name_version $verdir/proglib/*) pymodules=$(prepare_name_version $verdir/python/*) texpkg=$(prepare_name_version $verdir/tex/texlive) -- cgit v1.2.1