[SCM] Image Reduction and Analysis Facility branch, debian, updated. 2ed5153522c1f923da70822b59c44e6544884252

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 69e21322c1f9c998dcf87f683f0c6cc7ce2ab19b
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sun Jun 2 21:10:03 2013 +0200

    Fix IRAF build environment variables

diff --git a/debian/rules b/debian/rules
index 96997eb..f342ce3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,10 +4,10 @@
 #export DH_VERBOSE=1
 
 export iraf=$(shell pwd)/
-export host=unix
-export hlib=${iraf}${host}/hlib/
-export pkglibs=${iraf}noao/lib/,${iraf}${host}/hlib/libc/,${iraf}${host}/bin/
-export PATH := ${PATH}:${iraf}${host}/bin/
+export host=${iraf}unix/
+export hlib=${host}hlib/
+export pkglibs=${iraf}noao/lib/,${hlib}/libc/,${host}bin/
+export PATH := ${PATH}:${host}bin/:${hlib}bin/
 export HOST_CURL=1
 export HOST_READLINE=1
 export HOST_EXPAT=1
@@ -21,8 +21,9 @@ tmp_links:
 	ln -sf bin.${IRAFARCH} bin
 	ln -sf bin.${IRAFARCH} noao/bin
 	ln -sf bin.${IRAFARCH} vo/bin
-	ln -sf mach`getconf LONG_BIT`.h ${host}/hlib/mach.h
-	ln -sf iraf`getconf LONG_BIT`.h ${host}/hlib/iraf.h
+	ln -sf mach`getconf LONG_BIT`.h ${hlib}/mach.h
+	ln -sf iraf`getconf LONG_BIT`.h ${hlib}/iraf.h
+	ls -l ${hlib}*.h
 
 override_dh_auto_configure: tmp_links
 
@@ -37,13 +38,13 @@ sysnovos: libvo_novos
 	ln -sf xc.e unix/bin/xc
 
 libvo: sysnovos
-	pkglibs=${iraf}noao/lib/,${iraf}${host}/bin/,${iraf}${host}/hlib/ \
+	pkglibs=${iraf}noao/lib/,${host}bin/,${hlib} \
 	  make -C vendor/voclient clean mylib
 	cp vendor/voclient/libvo/libVO.a ${iraf}lib
 
 override_dh_auto_build-arch: libvo
 	chmod a+x util/mksysvos
-	pkglibs=${iraf}noao/lib/,${iraf}${host}/bin/,${iraf}${host}/hlib/libc/ \
+	pkglibs=${iraf}noao/lib/,${host}bin/,${hlib}/libc/ \
 	  csh -f ${iraf}util/mksysvos
 
 override_dh_auto_install-indep:
@@ -67,8 +68,8 @@ override_dh_auto_install-indep:
 override_dh_auto_clean:
 	rm -rf vo/votools/.old
 	rm -rf vo/votools/.url*
-	rm -f  ${host}/bin/*
-	rm -rf ${host}/bin.*/*
+	rm -f  ${host}bin/*
+	rm -rf ${host}bin.*/*
 	find . -name "*.a" | xargs rm -f
 	rm -f sys/vops/ak/*.x
 	find pkg -name "*.e"  | xargs rm -f

-- 
Image Reduction and Analysis Facility