[Debian-astro-commits] [iraf] 01/01: Fixing compilation of external tasks

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch master
in repository iraf.

commit 0b6342cf979b2949c848041b31df4d29b8c6ef16
Author: Ole Streicher <olebole at debian.org>
Date:   Sun Nov 26 15:46:24 2017 +0100

    Fixing compilation of external tasks
---
 debian/iraf-dev.install                            |  1 +
 debian/irafcl                                      |  4 +++
 .../Make-the-installation-FHS-conform.patch        | 30 +++++++++++++++++++++-
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/debian/iraf-dev.install b/debian/iraf-dev.install
index 2de038e..a034adb 100644
--- a/debian/iraf-dev.install
+++ b/debian/iraf-dev.install
@@ -6,3 +6,4 @@ unix/bin/lib*.a usr/lib/iraf/unix
 unix/hlib/*.h usr/share/iraf/unix/hlib
 unix/hlib/libc/ usr/share/iraf/unix/hlib
 usr/share/iraf/pkg/softools
+lib/sysruk.x usr/share/iraf/lib
diff --git a/debian/irafcl b/debian/irafcl
index c746fad..493cb25 100755
--- a/debian/irafcl
+++ b/debian/irafcl
@@ -17,6 +17,10 @@ fi
 
 export iraf="/usr/share/iraf/"
 export host="${iraf}unix/"
+export hlib="${iraf}unix/hlib/"
+export hbin="${irafbin}/unix"
+export F77="$hlib/f77.sh"
+export F2C="$hbin/f2c.e"
 
 while getopts "h?vcef:" opt; do
     case "$opt" in
diff --git a/debian/patches/Make-the-installation-FHS-conform.patch b/debian/patches/Make-the-installation-FHS-conform.patch
index bd0b5ad..0da4ccb 100644
--- a/debian/patches/Make-the-installation-FHS-conform.patch
+++ b/debian/patches/Make-the-installation-FHS-conform.patch
@@ -6,12 +6,14 @@ This moves the IRAF installation from /iraf/iraf/ to /usr/share/iraf/, with
 the system dependent files (binaries) in /usr/lib/iraf.
 ---
  noao/lib/zzsetenv.def  |  4 ++--
+ pkg/cl/exec.c          |  2 +-
  pkg/cl/main.c          | 12 +++++++++++-
+ pkg/ecl/exec.c         |  2 +-
  pkg/ecl/main.c         | 12 +++++++++++-
  unix/hlib/login.cl     | 23 ++++++++++++-----------
  unix/hlib/zzsetenv.def |  3 ++-
  unix/os/irafpath.c     | 10 ++++++++++
- 6 files changed, 48 insertions(+), 16 deletions(-)
+ 8 files changed, 50 insertions(+), 18 deletions(-)
 
 diff --git a/noao/lib/zzsetenv.def b/noao/lib/zzsetenv.def
 index c38a4be..d51ff4c 100644
@@ -27,6 +29,19 @@ index c38a4be..d51ff4c 100644
  set	noaolib		= "noao$lib/"
  set	ccdtime		= "noaolib$ccdtime/"
  set	onedstds	= "noaolib$onedstds/"
+diff --git a/pkg/cl/exec.c b/pkg/cl/exec.c
+index efbd98b..25e9f2d 100644
+--- a/pkg/cl/exec.c
++++ b/pkg/cl/exec.c
+@@ -705,7 +705,7 @@ findexe (
+ 
+ 	if (c_access (bin_path, 0, 0) == YES) {
+ 	    return (bin_path);
+-	} else {
++	} else if (arch != NULL) {
+ 	    /*  The binary wasn't found in the expected bin directory, but
+ 	     *  on certain platforms look for alternate binaries that may
+ 	     *  work.  This supports backward compatability with older
 diff --git a/pkg/cl/main.c b/pkg/cl/main.c
 index 0471f4c..6027bf3 100644
 --- a/pkg/cl/main.c
@@ -50,6 +65,19 @@ index 0471f4c..6027bf3 100644
              }
  
  	} else {
+diff --git a/pkg/ecl/exec.c b/pkg/ecl/exec.c
+index 322a3ce..4e70bf6 100644
+--- a/pkg/ecl/exec.c
++++ b/pkg/ecl/exec.c
+@@ -750,7 +750,7 @@ findexe (
+ 
+ 	if (c_access (bin_path, 0, 0) == YES) {
+ 	    return (bin_path);
+-	} else {
++	} else if (arch != NULL) {
+ 	    /*  The binary wasn't found in the expected bin directory, but
+ 	     *  on certain platforms look for alternate binaries that may
+ 	     *  work.  This supports backward compatability with older
 diff --git a/pkg/ecl/main.c b/pkg/ecl/main.c
 index ee1aeae..7e927c9 100644
 --- a/pkg/ecl/main.c

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/iraf.git