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/python.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/python.mk')
| -rw-r--r-- | reproduce/software/make/python.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/reproduce/software/make/python.mk b/reproduce/software/make/python.mk index a15841c..1ef1bf2 100644 --- a/reproduce/software/make/python.mk +++ b/reproduce/software/make/python.mk @@ -600,7 +600,7 @@ $(ipydir)/numpy: $(ibidir)/unzip \ export LDFLAGS="$(LDFLAGS) -shared"; \ fi; \ export CFLAGS="--std=c99 $$CFLAGS"; \ - conf="$$(pwd)/reproduce/software/config/installation/numpy-scipy.cfg"; \ + conf="$$(pwd)/reproduce/software/config/numpy-scipy.cfg"; \ $(call pybuild, unzip, numpy-$(numpy-version),$$conf, \ Numpy $(numpy-version)) \ && cp $(dtexdir)/numpy.tex $(ictdir)/ \ @@ -679,7 +679,7 @@ $(ipydir)/scipy: $(ipydir)/numpy \ else \ export LDFLAGS="$(LDFLAGS) -shared"; \ fi; \ - conf="$$(pwd)/reproduce/software/config/installation/numpy-scipy.cfg"; \ + conf="$$(pwd)/reproduce/software/config/numpy-scipy.cfg"; \ $(call pybuild, tar xf, scipy-$(scipy-version),$$conf) \ && cp $(dtexdir)/scipy.tex $(ictdir)/ \ && echo "Scipy $(scipy-version) \citep{scipy2007,scipy2011}" > $@ |