diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-04-17 01:06:20 +0100 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-04-17 01:06:20 +0100 |
| commit | 8eb0892e179b4970a9835d29b5f57dd912ca4464 (patch) | |
| tree | b0858d1021efc399106e2936aa44c4fc37196edb /reproduce/software/make/high-level.mk | |
| parent | e0a57efde9206c0c7420e03e5fb2a354d568c3ad (diff) | |
IMPORTANT: software config directly under reproduce/software/config
Until now the software configuration parameters were defined under the
`reproduce/software/config/installation/' directory. This was because the
configuration parameters of analysis software (for example Gnuastro's
configurations) were placed under there too. But this was terribly
confusing, because the run-time options of programs falls under the
"analysis" phase of the project.
With this commit, the Gnuastro configuration files have been moved under
the new `reproduce/analysis/config/gnuastro' directory and the software
configuration files are directly under `reproduce/software/config'. A clean
build was done with this change and it didn't crash, but it may cause
crashes in derived projects, so after merging with Maneage, please
re-configure your project to see if anything has been missed. Please let us
know if there is a problem.
Diffstat (limited to 'reproduce/software/make/high-level.mk')
| -rw-r--r-- | reproduce/software/make/high-level.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk index 6e01354..e62f02f 100644 --- a/reproduce/software/make/high-level.mk +++ b/reproduce/software/make/high-level.mk @@ -27,12 +27,12 @@ # Top level environment +include reproduce/software/config/LOCAL.conf include reproduce/software/make/build-rules.mk -include reproduce/software/config/installation/LOCAL.conf -include reproduce/software/config/installation/TARGETS.conf -include reproduce/software/config/installation/versions.conf -include reproduce/software/config/installation/checksums.conf -include reproduce/software/config/installation/texlive-packages.conf +include reproduce/software/config/TARGETS.conf +include reproduce/software/config/versions.conf +include reproduce/software/config/checksums.conf +include reproduce/software/config/texlive-packages.conf lockdir = $(BDIR)/locks tdir = $(BDIR)/software/tarballs @@ -1240,7 +1240,7 @@ $(ibidir)/xlsxio: $(ibidir)/cmake \ tlmirror=http://mirrors.rit.edu/CTAN/systems/texlive/tlnet # The core TeX Live system. -$(itidir)/texlive-ready-tlmgr: reproduce/software/config/installation/texlive.conf \ +$(itidir)/texlive-ready-tlmgr: reproduce/software/config/texlive.conf \ | $(tdir)/install-tl-unx.tar.gz # Unpack, enter the directory, and install based on the given @@ -1251,7 +1251,7 @@ $(itidir)/texlive-ready-tlmgr: reproduce/software/config/installation/texlive.co tar xf $(tdir)/install-tl-unx.tar.gz cd install-tl-* sed -e's|@installdir[@]|$(idir)|g' \ - $$topdir/reproduce/software/config/installation/texlive.conf \ + $$topdir/reproduce/software/config/texlive.conf \ > texlive.conf # TeX Live's installation may fail due to any reason. But TeX Live @@ -1292,7 +1292,7 @@ $(itidir)/texlive-ready-tlmgr: reproduce/software/config/installation/texlive.co #else #forbiber = $(ibidir)/libnsl #endif -$(itidir)/texlive: reproduce/software/config/installation/texlive-packages.conf \ +$(itidir)/texlive: reproduce/software/config/texlive-packages.conf \ $(itidir)/texlive-ready-tlmgr \ $(forbiber) |