Replace hard-coded host$bin paths by IRAFPATH #128
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The function
irafpath()
resolves the full path for a given IRAF file. The file is searched in the following directories:host$bin(arch)
: system build executables and librarieshost$hlib
: include files and shell scriptsiraf$bin(arch)
: IRAF executables and librariesiraf$lib
: IRAF include files and libraries (links)While
iraf$bin(arch)
is created from IRAFARCH,host$bin(arch)
is hardcoded by defines like#ifdef __x86_64__
. This has two disadvantages: First, it fixes the architecture names in the executable, and second it requires a source change for every new arch. And it does not allow to have only arch-independent directory names, as it is used f.e. in Debian.This patch unifies the handling architectures in
irafpath()
. This continues the path started with #117.The code in question goes back to the first recorded IRAF version 2.8:
iraf/unix/os/irafpath.c
Lines 68 to 101 in 155505b