[Debian-astro-commits] [iraf] 03/06: Put f2c.h in iraf$include

[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 9e6bcef7c06021d50e4dac4a481d70cc3f17763a
Author: Ole Streicher <olebole at debian.org>
Date:   Fri Dec 15 11:58:27 2017 +0100

    Put f2c.h in iraf$include
---
 debian/iraf-dev.install                            |  2 --
 .../Propagate-CFLAGS-and-debug-flag-to-xc.patch    | 33 ++++++++++++++++++----
 debian/rules                                       |  2 ++
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/debian/iraf-dev.install b/debian/iraf-dev.install
index 975b1f9..a0672e2 100644
--- a/debian/iraf-dev.install
+++ b/debian/iraf-dev.install
@@ -32,7 +32,6 @@ unix/bin/wtar.e usr/lib/iraf/unix/bin
 unix/bin/xc.e usr/lib/iraf/unix/bin
 unix/bin/xpp.e usr/lib/iraf/unix/bin
 unix/bin/xyacc.e usr/lib/iraf/unix/bin
-unix/f2c/libf2c/f2c.h usr/lib/iraf/unix/f2c/libf2c
 unix/hlib/*.h usr/lib/iraf/unix/hlib
 unix/hlib/*.inc usr/lib/iraf/unix/hlib
 unix/hlib/*.sf usr/lib/iraf/unix/hlib
@@ -40,5 +39,4 @@ unix/hlib/f77.sh usr/lib/iraf/unix/hlib
 unix/hlib/libc/ usr/lib/iraf/unix/hlib
 usr/lib/iraf/pkg/softools
 usr/lib/iraf/unix/boot
-usr/lib/iraf/unix/f2c
 usr/lib/iraf/unix/os
diff --git a/debian/patches/Propagate-CFLAGS-and-debug-flag-to-xc.patch b/debian/patches/Propagate-CFLAGS-and-debug-flag-to-xc.patch
index 6c0ba15..9f74776 100644
--- a/debian/patches/Propagate-CFLAGS-and-debug-flag-to-xc.patch
+++ b/debian/patches/Propagate-CFLAGS-and-debug-flag-to-xc.patch
@@ -4,13 +4,14 @@ Subject: Propagate CFLAGS and debug flag to xc
 
 ---
  Makefile                   | 2 --
- unix/hlib/f77.sh           | 2 +-
+ unix/hlib/f77.sh           | 5 +++--
  unix/hlib/irafuser.sh      | 4 ++--
+ unix/hlib/libc/libc.h      | 2 +-
  unix/hlib/mkpkg.inc        | 4 ++--
  unix/hlib/mkpkg.sf         | 2 +-
  vendor/Makefile            | 2 --
  vendor/libvotable/Makefile | 3 +--
- 7 files changed, 7 insertions(+), 12 deletions(-)
+ 8 files changed, 10 insertions(+), 14 deletions(-)
 
 diff --git a/Makefile b/Makefile
 index f455ba9..b572b4a 100644
@@ -29,18 +30,25 @@ index f455ba9..b572b4a 100644
  AR 		= ar clq
  CP 		= cp -p
 diff --git a/unix/hlib/f77.sh b/unix/hlib/f77.sh
-index e990e90..d0fad3e 100755
+index e990e90..4f21b16 100755
 --- a/unix/hlib/f77.sh
 +++ b/unix/hlib/f77.sh
-@@ -44,7 +44,7 @@ s=/tmp/stderr_$$
+@@ -42,12 +42,13 @@
+ 
+ s=/tmp/stderr_$$
  t=/tmp/f77_$$
++iraf=${iraf:-'/usr/lib/iraf/'}
  #CC=${CC_f2c:-'/usr/bin/cc -m486'}
  CC=${CC_f2c:-'gcc'}
 -CFLAGS=${CFLAGS:-"-I${iraf}unix/f2c/libf2c"}
-+CFLAGS="-I${iraf}unix/f2c/libf2c ${XC_CFLAGS}"
++CFLAGS="-I${iraf}include ${XC_CFLAGS}"
  EFL=${EFL:-/v/bin/efl}
  EFLFLAGS=${EFLFLAGS:-'system=portable deltastno=10'}
- F2C=${F2C:-/usr/bin/f2c}
+-F2C=${F2C:-/usr/bin/f2c}
++F2C=${F2C:-${iraf}unix/bin/f2c.e}
+ F2CFLAGS=${F2CFLAGS:='-KRw8 -Nn802'}
+ keepc=0
+ warn=1
 diff --git a/unix/hlib/irafuser.sh b/unix/hlib/irafuser.sh
 index 78c9ed2..8fd03c3 100755
 --- a/unix/hlib/irafuser.sh
@@ -59,6 +67,19 @@ index 78c9ed2..8fd03c3 100755
  export HSI_F77LIBS=""
  export HSI_LFLAGS=""
  export HSI_OSLIBS=""
+diff --git a/unix/hlib/libc/libc.h b/unix/hlib/libc/libc.h
+index e6290b9..58f2d91 100644
+--- a/unix/hlib/libc/libc.h
++++ b/unix/hlib/libc/libc.h
+@@ -325,7 +325,7 @@ extern void	c_xwhen (int exception, PFI new_handler, PFI *old_handler);
+ 
+ /*
+ */
+-#include "../../f2c/libf2c/f2c.h"
++#include "f2c.h"
+ #include "vosproto.h"
+ 
+ #define	D_libc
 diff --git a/unix/hlib/mkpkg.inc b/unix/hlib/mkpkg.inc
 index ead98b9..49353ac 100644
 --- a/unix/hlib/mkpkg.inc
diff --git a/debian/rules b/debian/rules
index 329c2db..dbcd9b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,7 @@ override_dh_auto_configure:
 	          --cache $(BUILD_TMP)/cache \
                   --imdir $(BUILD_TMP)/imdir \
 	          --root $(iraf) < /dev/null || true
+	cp unix/f2c/libf2c/f2c.h include/
 	$(MAKE) $(IRAFARCH)
 
 override_dh_auto_build:
@@ -52,6 +53,7 @@ override_dh_auto_install:
 	mv debian/tmp/usr/lib/iraf/unix/hlib/motd.etc debian/tmp/etc/iraf/motd
 	mv debian/tmp/usr/lib/iraf/dev/irafhosts debian/tmp/etc/iraf/
 	rm -f debian/tmp/usr/lib/iraf/dev/hosts debian/tmp/usr/lib/iraf/dev/uhosts
+	rm -rf debian/tmp/usr/lib/iraf/unix/f2c
 	echo '# HOSTS -- IRAF local network host table.' > debian/tmp/etc/iraf/hosts
 	for f in unix/hlib/util.sh \
 	         unix/hlib/mkiraf.sh unix/hlib/mkmlist.sh \

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