diff options
| author | James Turner <jturner@gemini.edu> | 2016-12-21 15:57:25 -0500 |
|---|---|---|
| committer | James Turner <jturner@gemini.edu> | 2016-12-21 15:57:25 -0500 |
| commit | 1fe6cbc2fd520fc854510fb866dabe11bd426f14 (patch) | |
| tree | 5d5b20af65a87d4835df64ba50773d00a7a44cc1 /scripts | |
| parent | afa35cc5897ca50f377297602c372e817fdcab54 (diff) | |
| download | astroconda-iraf-helpers-1fe6cbc2fd520fc854510fb866dabe11bd426f14.tar.gz | |
Support conda IRAF packages named pyraf.pkgname, as well as iraf.pkgname.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/ac_build_iraf_pkg | 4 |
1 files 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: |