From 1fe6cbc2fd520fc854510fb866dabe11bd426f14 Mon Sep 17 00:00:00 2001 From: James Turner Date: Wed, 21 Dec 2016 17:57:25 -0300 Subject: Support conda IRAF packages named pyraf.pkgname, as well as iraf.pkgname. --- scripts/ac_build_iraf_pkg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ac_build_iraf_pkg b/scripts/ac_build_iraf_pkg index 6b756de..0428078 100755 --- a/scripts/ac_build_iraf_pkg +++ b/scripts/ac_build_iraf_pkg @@ -39,9 +39,9 @@ unset ARCH CFLAGS CXXFLAGS LDFLAGS MACOSX_DEPLOYMENT_TARGET # Create any new dirs & files with the expected permissions: umask 022 -# Strip any "iraf." from the Conda package name, to get the IRAF equivalent +# Strip any "iraf." from the Conda package name, to get the IRAF equivalent, # and determine the installation path accordingly: -pkg_name=`echo "$PKG_NAME" | sed -e 's|^iraf[.]||'` +pkg_name=`echo "$PKG_NAME" | sed -e 's|^iraf[.]||' -e 's|^pyraf[.]||'` pkg_path="${PREFIX}/${extern_dir}/${pkg_name}" # Create the destination directory, if needed: -- cgit