[Debian-astro-commits] [iraf] 01/01: Also check bin subdir (w/o arch) for libs

[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 774242ddb12810004ff0b4d747853efb19f819de
Author: Ole Streicher <olebole at debian.org>
Date:   Tue Dec 12 16:04:27 2017 +0100

    Also check bin subdir (w/o arch) for libs
---
 ...ure-dependency-in-the-names-of-bin-subdir.patch | 50 ++++++++++++++++++----
 1 file changed, 42 insertions(+), 8 deletions(-)

diff --git a/debian/patches/Remove-architecture-dependency-in-the-names-of-bin-subdir.patch b/debian/patches/Remove-architecture-dependency-in-the-names-of-bin-subdir.patch
index 201b9bd..6373bb0 100644
--- a/debian/patches/Remove-architecture-dependency-in-the-names-of-bin-subdir.patch
+++ b/debian/patches/Remove-architecture-dependency-in-the-names-of-bin-subdir.patch
@@ -4,13 +4,14 @@ Subject: Remove architecture dependency in the names of `bin` subdirs.
 
 Instead of bin.linux, bin.linux64 they will be names just "bin".
 ---
- noao/lib/zzsetenv.def  |  4 ++--
- pkg/cl/exec.c          |  2 +-
- pkg/ecl/exec.c         |  2 +-
- test/run_tests         | 10 ++++------
- unix/hlib/zzsetenv.def |  3 ++-
- unix/os/irafpath.c     | 16 ----------------
- 6 files changed, 10 insertions(+), 27 deletions(-)
+ noao/lib/zzsetenv.def       |  4 ++--
+ pkg/cl/exec.c               |  2 +-
+ pkg/ecl/exec.c              |  2 +-
+ test/run_tests              | 10 ++++------
+ unix/boot/bootlib/envinit.c |  3 +--
+ unix/hlib/zzsetenv.def      |  3 ++-
+ unix/os/irafpath.c          | 26 +++++++-------------------
+ 7 files changed, 18 insertions(+), 32 deletions(-)
 
 diff --git a/noao/lib/zzsetenv.def b/noao/lib/zzsetenv.def
 index c38a4be..f70c92f 100644
@@ -74,6 +75,21 @@ index 72c58cb..1731304 100755
  
  TEST_FILES=""
  IRAF_SHELLS=""
+diff --git a/unix/boot/bootlib/envinit.c b/unix/boot/bootlib/envinit.c
+index e70a8d8..8d6e7ef 100644
+--- a/unix/boot/bootlib/envinit.c
++++ b/unix/boot/bootlib/envinit.c
+@@ -139,9 +139,8 @@ _envinit (void)
+ 		XCHAR   x_name[SZ_PATHNAME+1];
+ 		XCHAR   x_value[SZ_PATHNAME+1];
+ 
+-		sprintf (osfn, ".%s", irafarch);
+ 		os_strupk (ARCH, x_name, SZ_PATHNAME);
+-		os_strupk (osfn, x_value, SZ_PATHNAME);
++		os_strupk ("", x_value, SZ_PATHNAME);
+ 		ENVRESET (x_name, x_value);
+ 	    }
+ }
 diff --git a/unix/hlib/zzsetenv.def b/unix/hlib/zzsetenv.def
 index e1c3db9..006eb26 100644
 --- a/unix/hlib/zzsetenv.def
@@ -90,7 +106,7 @@ index e1c3db9..006eb26 100644
  set	dev		= "iraf$dev/"
  set	doc		= "iraf$doc/"
 diff --git a/unix/os/irafpath.c b/unix/os/irafpath.c
-index 96e147a..121c46c 100644
+index 96e147a..3c9cc26 100644
 --- a/unix/os/irafpath.c
 +++ b/unix/os/irafpath.c
 @@ -73,22 +73,6 @@ char *fname;			/* simple filename, no dirs */
@@ -116,3 +132,21 @@ index 96e147a..121c46c 100644
  	strcat (pathname, "/");
  	strcat (pathname, fname);
  	if (access (pathname, 0) == 0)
+@@ -107,10 +91,14 @@ char *fname;			/* simple filename, no dirs */
+ 	    strcat (pathname, "bin.");
+ 	    strcat (pathname, irafarch);
+ 	    strcat (pathname, "/");
+-	} else {
+-	    strcpy (pathname, (char *)irafdir);
+-	    strcat (pathname, "bin/");
++	    strcat (pathname, fname);
++	    if (access (pathname, 0) == 0)
++	      return (pathname);
+ 	}
++
++	/* Try BIN */
++	strcpy (pathname, (char *)irafdir);
++	strcat (pathname, "bin/");
+ 	strcat (pathname, fname);
+ 	if (access (pathname, 0) == 0)
+ 	    return (pathname);

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