From fd88ac3569196ef3ea7f8463af7cf34277d577f5 Mon Sep 17 00:00:00 2001
From: Raul Infante-Sainz <infantesainz@gmail.com>
Date: Tue, 16 Apr 2019 13:09:06 +0100
Subject: Typo corrections in Astrometry-net dependency rules

Due to the copy/paste of rules from other files, in some rules there
were some spaces insteand of tab. There were also a lack of semicolon in
the building of CC, and bad extensions in various tarballs.

With this commit, all of these typos have been fixed.
---
 .file-metadata                        | Bin 5532 -> 5889 bytes
 reproduce/software/make/basic.mk      |   6 +++---
 reproduce/software/make/high-level.mk |  22 +++++++++++-----------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.file-metadata b/.file-metadata
index e4c87cf..87f4c93 100644
Binary files a/.file-metadata and b/.file-metadata differ
diff --git a/reproduce/software/make/basic.mk b/reproduce/software/make/basic.mk
index 4fc104d..8a52038 100644
--- a/reproduce/software/make/basic.mk
+++ b/reproduce/software/make/basic.mk
@@ -854,7 +854,7 @@ $(ibidir)/gcc: $(gcc-prerequisites)   \
 	  $(call makelink,gcc);                                            \
 	  $(call makelink,g++,mandatory);                                  \
 	  $(call makelink,gfortran,mandatory);                             \
-	  ln -sf $(which gcc) $(ibdir)/cc;                                 \
+	  ln -sf $$(which gcc) $(ibdir)/cc;                                \
 	  ccinfo=$$(gcc --version | awk 'NR==1');                          \
 	  echo "C compiler (""$$ccinfo"")" > $@;                           \
 	else                                                               \
@@ -899,7 +899,7 @@ $(ibidir)/gcc: $(gcc-prerequisites)   \
 	           patchelf --set-rpath $(ildir) $$f;                      \
 	         fi;                                                       \
 	       done;                                                       \
-	     fi                                                            \
-	  ln -sf $(ibdir)/gcc $(ibdir)/cc;                                 \
+	     fi;                                                           \
+	  ln -sf $(ibdir)/gcc $(ibdir)/cc                                  \
 	  && echo "GNU Compiler Collection (GCC) $(gcc-version)" > $@;     \
 	fi
diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk
index 932aedc..a904cae 100644
--- a/reproduce/software/make/high-level.mk
+++ b/reproduce/software/make/high-level.mk
@@ -117,7 +117,7 @@ include reproduce/software/make/python.mk
 tarballs = $(foreach t, astrometry.net-$(astrometry-version).tar.gz        \
                         cfitsio-$(cfitsio-version).tar.gz                  \
                         atlas-$(atlas-version).tar.bz2                     \
-                        cairo-$(cairo-version).tar.bz2                     \
+                        cairo-$(cairo-version).tar.xz                      \
                         cmake-$(cmake-version).tar.gz                      \
                         curl-$(curl-version).tar.gz                        \
                         freetype-$(freetype-version).tar.gz                \
@@ -135,7 +135,7 @@ tarballs = $(foreach t, astrometry.net-$(astrometry-version).tar.gz        \
                         libgit2-$(libgit2-version).tar.gz                  \
                         libxml2-$(libxml2-version).tar.gz                  \
                         metastore-$(metastore-version).tar.gz              \
-                        netpbm-$(netpbm-version).tar.gz                    \
+                        netpbm-$(netpbm-version).tgz                       \
                         openmpi-$(openmpi-version).tar.gz                  \
                         openblas-$(openblas-version).tar.gz                \
                         pixman-$(pixman-version).tar.gz                    \
@@ -279,8 +279,8 @@ $(ilidir)/cairo: $(tdir)/cairo-$(cairo-version).tar.xz    \
                  $(ilidir)/freetype                       \
                  $(ilidir)/libpng                         \
                  $(ilidir)/pixman
-       $(call gbuild, $<, cairo-$(cairo-version), static) \
-       && echo "Cairo $(cairo-version)" > $@
+	$(call gbuild, $<, cairo-$(cairo-version), static)    \
+	&& echo "Cairo $(cairo-version)" > $@
 
 $(ilidir)/gsl: $(tdir)/gsl-$(gsl-version).tar.gz
 	$(call gbuild, $<, gsl-$(gsl-version), static) \
@@ -298,7 +298,7 @@ $(ilidir)/freetype: $(tdir)/freetype-$(freetype-version).tar.gz \
 	$(call gbuild, $<, freetype-$(freetype-version), static) \
 	&& echo "FreeType $(freetype-version)" > $@
 
-$(ilidir)/hdf5: $(tdir)/hdf5-$(hdf5-version).tar.gz \
+$(ilidir)/hdf5: $(tdir)/hdf5-$(hdf5-version).tar.gz  \
                 $(ilidir)/openmpi
 	export CC=mpicc;                                 \
 	export FC=mpif90;                                \
@@ -326,13 +326,13 @@ $(ilidir)/libxml2: $(tdir)/libxml2-$(libxml2-version).tar.gz
        # ./configure --without-python
        # If you really need the Python bindings, try the
        # --with-python-install-dir=DIR option
-       $(call gbuild, $<, libxml2-$(libxml2-version), static, \
-                      --without-python)                       \
-       && echo "Libxml2 $(libxml2-version)" > $@
+	$(call gbuild, $<, libxml2-$(libxml2-version), static, \
+                   --without-python)                       \
+	&& echo "Libxml2 $(libxml2-version)" > $@
 
 $(ilidir)/pixman: $(tdir)/pixman-$(pixman-version).tar.gz
-       $(call gbuild, $<, pixman-$(pixman-version), static) \
-       && echo "Pixman $(pixman-version)" > $@
+	$(call gbuild, $<, pixman-$(pixman-version), static) \
+	&& echo "Pixman $(pixman-version)" > $@
 
 $(ilidir)/libtiff: $(tdir)/tiff-$(libtiff-version).tar.gz \
                    $(ilidir)/libjpeg
@@ -342,7 +342,7 @@ $(ilidir)/libtiff: $(tdir)/tiff-$(libtiff-version).tar.gz \
 
 $(ilidir)/openmpi: $(tdir)/openmpi-$(openmpi-version).tar.gz
 	$(call gbuild, $<, openmpi-$(openmpi-version), static, , V=1) \
-	&& echo "OpenMPI $(openmpi-version)" > $@
+	&& echo "Open MPI $(openmpi-version)" > $@
 
 $(ilidir)/atlas: $(tdir)/atlas-$(atlas-version).tar.bz2 \
 	         $(tdir)/lapack-$(lapack-version).tar.gz
-- 
cgit v1.2.1