diff options
Diffstat (limited to 'reproduce/src/make')
| -rw-r--r-- | reproduce/src/make/dependencies.mk | 8 | ||||
| -rw-r--r-- | reproduce/src/make/initialize.mk | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/reproduce/src/make/dependencies.mk b/reproduce/src/make/dependencies.mk index a28de19..92febb1 100644 --- a/reproduce/src/make/dependencies.mk +++ b/reproduce/src/make/dependencies.mk @@ -108,8 +108,8 @@ tarballs = $(foreach t, astropy-$(astropy-version).tar.gz \ python-$(python-version).tar.gz \ unzip-$(unzip-version).tar.gz \ tiff-$(libtiff-version).tar.gz \ - zip-$(zip-version).tar.gz \ wcslib-$(wcslib-version).tar.bz2 \ + zip-$(zip-version).tar.gz \ , $(tdir)/$(t) ) $(tarballs): $(tdir)/%: if [ -f $(DEPENDENCIES-DIR)/$* ]; then @@ -157,8 +157,8 @@ $(tarballs): $(tdir)/%: w=ftp://ftp.info-zip.org/pub/infozip/src/unzip$$v.tgz elif [ $$n = wcslib ]; then w=ftp://ftp.atnf.csiro.au/pub/software/wcslib elif [ $$n = zip ]; then - mergenames=0; v=$$(echo $(zip-version) | sed -e's/\.//') - w=ftp://ftp.info-zip.org/pub/infozip/src/zip$$v.tgz + mergenames=0; v=$$(echo $(zip-version) | sed -e's/\.//') + w=ftp://ftp.info-zip.org/pub/infozip/src/zip$$v.tgz else echo; echo; echo; echo "'$$n' not recognized as a dependency name to download." @@ -457,7 +457,7 @@ endif make check -j$(numthreads)) $(ibdir)/python3: $(tdir)/python-$(python-version).tar.gz - $(call gbuild, $<, python-$(python-version)) \ + $(call gbuild, $<, Python-$(python-version)) \ && v=$$(echo $(python-version) | awk 'BEGIN{FS="."} \ {printf "%d.%d\n", $$1, $$2}') \ && ln -s $(ildir)/python$$v $(ildir)/python diff --git a/reproduce/src/make/initialize.mk b/reproduce/src/make/initialize.mk index dfdf161..71cdbb8 100644 --- a/reproduce/src/make/initialize.mk +++ b/reproduce/src/make/initialize.mk @@ -417,4 +417,3 @@ $(mtexdir)/initialize.tex: | $(mtexdir) $(call pvcheck, python3, $(python-version), Python, pythonversion) echo "\newcommand{\\numpyversion}{$(numpy-version)}" >> $@ echo "\newcommand{\\astropyversion}{$(astropy-version)}" >> $@ - |