Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16893

Modified Files:
        ccp4.info 
Log Message:
fix for compile error

Index: ccp4.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci/ccp4.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ccp4.info   4 Jan 2006 07:32:06 -0000       1.7
+++ ccp4.info   26 Jan 2006 21:11:57 -0000      1.8
@@ -10,8 +10,8 @@
 Source3-MD5: 21568dd2475505929573a3fd452c538f
 Depends: x11, tcltk, blt, ccp4-shlibs (>= %v-%r)
 BuildDepends: g77 (>= 3.4.0-2), f2c, fort77, tcltk-dev
-Replaces: mosflm (<= 6.2.3-2), mosflm-small (<= 6.2.3-2), refmac (<= 
5.1999-3), ccp4lib, ccp4lib-shlibs
-Conflicts: ccp4lib, ccp4lib-shlibs
+Replaces: mosflm (<= 6.2.3-2), mosflm-small (<= 6.2.3-2), refmac (<= 
5.1999-3), ccp4lib, ccp4lib-shlibs, ccp4 (<= 5.0.2-299 )
+Conflicts: ccp4lib, ccp4lib-shlibs, ccp4 (<= 5.0.2-299 )
 NoSetCPPFLAGS: true
 NoSetLDFLAGS: true
 #
@@ -41,6 +41,7 @@
 export TEMPXTAL=$PWD:h
 source include/%n.setup-zsh
 export DYLD_LIBRARY_PATH=$CLIB
+export PYTHONHOME=/System/Library/Frameworks/Python.framework/Versions/Current
 ./configure --with-x --with-shared-libs --with-fftw=%p Darwin
 #  fix some post-configure bugs
  perl -pi.bak -e 's/EXTRA_LOAD_FLAGS = -lg2c//g' **/*akefile
@@ -70,7 +71,8 @@
 cp xloggraph $CBIN/xloggraph.exe
 cd ../..
 #
-make realclean
+# make realclean
+/bin/rm -f **/*.o
 <<
 InstallScript: <<
 #!/bin/zsh -ef
@@ -81,7 +83,7 @@
 ORIGDIR=$(dirname $PWD)
 # Change environment scripts to match final installation
 perl -pi.bak -e 's|\$TEMPXTAL|%p/share/xtal|g' include/%n.setup*      # 
install prefix
-perl -pi.bak -e 's|\$TEMPXTAL|%p/share/xtal|g' lib/cctbx/cctbx_build/setpaths* 
+# perl -pi.bak -e 's|\$TEMPXTAL|%p/share/xtal|g' 
lib/cctbx/cctbx_build/setpaths* 
 #
 #
  cp ../XCCPJiffy-custom.gz  XCCPJiffy.gz ; gunzip XCCPJiffy.gz; chmod a+x 
XCCPJiffy
@@ -133,9 +135,9 @@
 #
  chmod a+x %i/etc/profile.d/%n.*
 #
- chmod a+x  %i/share/xtal/%n-%v/ccp4i/bin/osx_ccp4_mail
+ chmod a+x  %i/share/xtal/%n-%v/ccp4i/etc/osx_ccp4_mail
 #
- chmod a+x %i/share/xtal/%n-%v/etc/ccp4help 
+# chmod a+x %i/share/xtal/%n-%v/etc/ccp4help 
 #
  ranlib %i/lib/%n-%v/*.a
  ranlib %i/lib/%n-%v/**/*.a



-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to