From 586b0ca31224ee8817dceb6a185bfe9dbf5f037d Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Thu, 26 May 2016 13:52:17 -0400
Subject: Ensure UR_PKG_DIR exists with a blank extern.pkg

---
 iraf/build.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/iraf/build.sh b/iraf/build.sh
index b53692c..c500e74 100644
--- a/iraf/build.sh
+++ b/iraf/build.sh
@@ -9,9 +9,9 @@ unset LDFLAGS
 # Complement build script
 # ("UR_IRAFUSER" MUST BE SET OR BUILD WILL FAIL)
 export UR_IRAFUSER=1
+export UR_DIR_PKG=$PREFIX/variants/common/
 export sm_logs=`pwd`/logs
 export TERM=xterm
-export FAKE_IRAF="../iraf"
 
 # Minimal architecture detection
 # (We don't care about 64-bit)
@@ -31,8 +31,12 @@ case "$target" in
 esac
 
 
+# For UR_DIR_PKG to use (though I don't think we really need it anymore)
+mkdir -p $UR_DIR_PKG
+echo keep > $UR_DIR_PKG/extern.pkg
+
 # Copy working directory into PREFIX
-export iraf=$PREFIX/iraf
+export iraf=$PREFIX/iraf/
 #mkdir -p $iraf
 rsync -aH `pwd`/ $iraf
 cd $iraf
@@ -41,9 +45,6 @@ cd $iraf
 printenv
 ./build 32
 
-# Creating it made no sense... now we remove it
-#rm -rfv $FAKE_IRAF
-
 # General tasks below
 
 # Link binaries
@@ -59,8 +60,6 @@ mkdir -p "$iraf/vo/bin.generic"
 rm -fv "$iraf/vo/bin"
 ( cd $iraf/vo && ln -s bin.$IRAFARCH bin )
 
-
-
 # Not used... ?
 
 #echo "Fixing c headers..."
-- 
cgit