Set HDF5 directory during install, and make sure XMDS_USR is always e…

…xported
GrahamDennis · Oct 30, 2014 · 14ff650 · 14ff650
1 parent 9bba6ac
commit 14ff650
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/BuildScripts/output_noarch/share/xmds/xmds-postinst b/BuildScripts/output_noarch/share/xmds/xmds-postinst
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-XMDS_USR=`echo "$BASH_SOURCE" | sed -e 's|/share/xmds/xmds-postinst||'`
+export XMDS_USR=`echo "$BASH_SOURCE" | sed -e 's|/share/xmds/xmds-postinst||'`
+export HDF5_DIR="${XMDS_USR}"
 
 set +e
 

diff --git a/BuildScripts/output_noarch/share/xmds/xmds.conf b/BuildScripts/output_noarch/share/xmds/xmds.conf
@@ -1,11 +1,14 @@
 #!/bin/bash
 
-XMDS_USR=`echo "$BASH_SOURCE" | sed -e 's|/share/xmds/xmds.conf||'`
+export XMDS_USR=`echo "$BASH_SOURCE" | sed -e 's|/share/xmds/xmds.conf||'`
+export HDF5_DIR="${XMDS_USR}"
 
 if [ -z "$XMDS_SUPPORT" ]; then
     XMDS_SUPPORT="${HOME}/Library/XMDS"
 fi
 
+export XMDS_SUPPORT
+
 # If DEVELOPER_DIR has been set, find the compiler from that path.
 # This way we don't require that the Xcode command line tools have been installed.
 if [ ! -z "$DEVELOPER_DIR" ]; then