summaryrefslogtreecommitdiff
path: root/cfitsio
diff options
context:
space:
mode:
authorMatt Rendina <rendinam@users.noreply.github.com>2018-02-22 08:53:06 -0500
committerGitHub <noreply@github.com>2018-02-22 08:53:06 -0500
commitd4ccb57a335dfda4b3583107767a081691352b2f (patch)
tree43dd1892560bcc467c5eaf1373390cefe4707acd /cfitsio
parentebe4788bd2ee01f8b991f02d1665db3d87cc383d (diff)
parente027b0e371ddedc4377b43b425d2f67282ff45b7 (diff)
downloadastroconda-contrib-d4ccb57a335dfda4b3583107767a081691352b2f.tar.gz
Merge branch 'master' into patch-3
Diffstat (limited to 'cfitsio')
-rw-r--r--cfitsio/build.sh2
-rw-r--r--cfitsio/meta.yaml5
2 files changed, 5 insertions, 2 deletions
diff --git a/cfitsio/build.sh b/cfitsio/build.sh
index 0a523d1..6ceb369 100644
--- a/cfitsio/build.sh
+++ b/cfitsio/build.sh
@@ -1,3 +1,3 @@
./configure --prefix=$PREFIX --disable-static --enable-reentrant
-(make -j $CPU_COUNT shared && make install) || exit 1 \ No newline at end of file
+(make -j $CPU_COUNT shared && make install) \ No newline at end of file
diff --git a/cfitsio/meta.yaml b/cfitsio/meta.yaml
index 6dbd161..bc627ae 100644
--- a/cfitsio/meta.yaml
+++ b/cfitsio/meta.yaml
@@ -1,7 +1,10 @@
{% set name = 'cfitsio' %}
{% set version = '3.370' %}
{% set version_short = '3370' %}
-{% set number = '1' %}
+{% if version[0] == 'v' %}
+{% set version = version[1:] %}
+{% endif %}
+{% set number = '2' %}
about:
home: http://heasarc.gsfc.nasa.gov/fitsio/fitsio.html