[Xquartz-changes] [506] trunk/mk_x11_dist.sh

[source_changes at macosforge.org]

Revision: 506
          http://trac.macosforge.org/projects/xquartz/changeset/506
Author:   jeremyhu at freedesktop.org
Date:     2011-03-04 15:07:45 -0800 (Fri, 04 Mar 2011)
Log Message:
-----------
Set PYTHON, and don't clear out /tmp

Modified Paths:
--------------
    trunk/mk_x11_dist.sh

Modified: trunk/mk_x11_dist.sh
===================================================================
--- trunk/mk_x11_dist.sh	2011-03-04 22:58:47 UTC (rev 505)
+++ trunk/mk_x11_dist.sh	2011-03-04 23:07:45 UTC (rev 506)
@@ -84,6 +84,7 @@
 	ARCH_EXEC="-arch i386 -arch ppc"
 	ARCH_ALL="${ARCH_EXEC} -arch x86_64 -arch ppc64"
 	export CC="/usr/bin/gcc-4.2"
+	export PYTHON=/usr/bin/python2.5
 	export PYTHONPATH="/usr/X11/lib/python2.5:/usr/X11/lib/python2.5/site-packages"
 	export MACOSX_DEPLOYMENT_TARGET=10.5
 elif [[ "${TRAIN}" == "trains/SULeo" ]] ; then
@@ -95,6 +96,7 @@
 	if [[ "${MACOSFORGE_SL}" == "YES" ]] ; then
 		export CC="/opt/llvm/bin/clang"
 		#export CC="/opt/local/bin/clang"
+		export PYTHON=/usr/bin/python2.6
 		export PYTHONPATH="${X11_PREFIX}/lib/python2.6:${X11_PREFIX}/lib/python2.6/site-packages"
 		export MACOSX_DEPLOYMENT_TARGET=10.6
 	fi
@@ -134,7 +136,7 @@
 	fi
 }
 
-[[ $(echo /tmp/X11*.roots) = '/tmp/X11*.roots' ]] || /bin/rm -rf /tmp/X11*.roots
+#[[ $(echo /tmp/X11*.roots) = '/tmp/X11*.roots' ]] || /bin/rm -rf /tmp/X11*.roots
 
 [[ -n ${XPLUGIN} && -d X11_Xplugin/${XPLUGIN} ]]      && bit X11_Xplugin/${XPLUGIN}    -project X11_Xplugin   ${ARCH_ALL} 
 [[ -n ${X11MISC} && -d X11misc/${X11MISC} ]]          && bit X11misc/${X11MISC}        -project X11misc       ${ARCH_ALL}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/xquartz-changes/attachments/20110304/1195d57f/attachment.html>