[PC-BSD Commits] r14082 - pcbsd/current/src-sh/pbi-manager

[svn at pcbsd.org]

Author: kris
Date: 2011-11-30 09:40:31 -0800 (Wed, 30 Nov 2011)
New Revision: 14082

Modified:
   pcbsd/current/src-sh/pbi-manager/pbi-manager
Log:


Also set correct location to ccache install



Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2011-11-30 17:39:38 UTC (rev 14081)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2011-11-30 17:40:31 UTC (rev 14082)
@@ -1613,17 +1613,17 @@
 		make install clean
 		if [ $? -eq 0 ] ; then
 			# Setup environment variables
-			CCACHE_PATH="/usr/bin:/usr/local/bin"
+			CCACHE_PATH="/usr/bin:${LOCALBASE}/bin"
 			export CCACHE_PATH
 			CCACHE_DIR="/.ccache"
 			export CCACHE_DIR
-			PATH="/usr/local/libexec/ccache:${PATH}"
+			PATH="${LOCALBASE}/libexec/ccache:${PATH}"
 			export PATH
 
 			# Setup make configuration
 			echo ".if !defined(NO_CCACHE)" >> ${MAKE_CONF}
-			echo "  CC=/usr/local/libexec/ccache/world-cc" >> ${MAKE_CONF}
-			echo "  CXX=/usr/local/libexec/ccache/world-c++" >> ${MAKE_CONF}
+			echo "  CC=${LOCALBASE}/libexec/ccache/world-cc" >> ${MAKE_CONF}
+			echo "  CXX=${LOCALBASE}/libexec/ccache/world-c++" >> ${MAKE_CONF}
 			echo ".endif" >> ${MAKE_CONF}
 		else
 			echo "Failed installing ccache! Continuing without it..."