Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11685

Modified Files:
        ccp4.info 
Log Message:
fix for compilation problem on 10.4 that doesn't change package contents for 
10.5 or 10.6

Index: ccp4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/ccp4.info,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- ccp4.info   9 Sep 2009 00:26:16 -0000       1.53
+++ ccp4.info   5 Oct 2009 18:12:14 -0000       1.54
@@ -125,8 +125,15 @@
 export CCP4_MASTER=""
 export BLTWISHPREFIX=""
 export CCP4=""
-#
-source $PWD/include/ccp4.setup-bash
+# Fix for problem reported with 10.4
+if [[ $(sw_vers -productVersion) < 10.5 ]]; then
+    cp $PWD/include/ccp4.setup-bash $PWD/include/ccp4.setup-bash-10.4
+    export CURRENT_MASTER=$( dirname $PWD )
+    perl -pi -e "s|export CCP4_MASTER|export CCP4_MASTER=$CURRENT_MASTER|g"  
$PWD/include/ccp4.setup-bash-10.4
+    source $PWD/include/ccp4.setup-bash-10.4
+else
+    source $PWD/include/ccp4.setup-bash
+fi
 #
 echo $PWD should be the same as $CCP4
 [[ $CCP4 == $PWD ]] || exit 1


------------------------------------------------------------------------------
Come build with us! The BlackBerry&reg; Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9&#45;12, 2009. Register now&#33;
http://p.sf.net/sfu/devconf
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to