From 27afe92d3622cf424203ca56e915f5ef55125294 Mon Sep 17 00:00:00 2001
From: Daniel Joseph Barnhart Clark <dclark@pobox.com>
Date: Fri, 20 Jul 2007 00:09:19 +0000
Subject: EncapPackages: How's this for fun: If you have 2 seperate python
 binaries at different locations, both named "python", then somehow they both
 pick up the same python shared libraries, but if you call the second one
 using a different name, you get the shared library it's supposed to be using.
 This hit me when I installed a non-bcfg2 python in /usr/local, and suddenly
 bcfg2 stopped working with:

Traceback (most recent call last):
  File "/usr/local/bin/bcfg2", line 14, in ?
    import Bcfg2.Options
ImportError: No module named Bcfg2.Options

Because it was using the python that thought modules were under /usr/local/lib instead of /usr/local/lib/bcfg2/lib

This patch should fix it.

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3511 ce84e21b-d406-0410-9b95-82705330c041
---
 encap/src/encap-profiles/bcfg2-0.9.4i.ep               | 18 +++++++++---------
 encap/src/encap-profiles/bcfg2-cheetah-2.0rc8.ep       |  8 ++++----
 encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep    |  6 +++---
 encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep        |  8 ++++----
 encap/src/encap-profiles/bcfg2-python-apt-0.5.10.ep    |  8 ++++----
 .../encap-profiles/bcfg2-python-apt-0.6.16.2ubuntu8.ep |  8 ++++----
 encap/src/encap-profiles/bcfg2-python-apt-0.6.19.ep    |  8 ++++----
 encap/src/encap-profiles/bcfg2-setuptools-0.6c6.ep     |  8 ++++----
 encap/src/encap-profiles/bcfg2-swig-1.3.31.ep          |  2 +-
 encap/src/encap-profiles/server/bcfg2-lxml-1.2.1.ep    |  8 ++++----
 .../src/encap-profiles/server/bcfg2-pyrex-0.9.5.1a.ep  |  6 +++---
 11 files changed, 44 insertions(+), 44 deletions(-)

(limited to 'encap')

diff --git a/encap/src/encap-profiles/bcfg2-0.9.4i.ep b/encap/src/encap-profiles/bcfg2-0.9.4i.ep
index f682e38e1..2bbfa49bb 100644
--- a/encap/src/encap-profiles/bcfg2-0.9.4i.ep
+++ b/encap/src/encap-profiles/bcfg2-0.9.4i.ep
@@ -111,7 +111,7 @@ Index: bcfg2/src/lib/Client/XML.py
 <configure type="unset" />
 
 <build>
-/usr/local/lib/bcfg2/bin/python setup.py build \
+/usr/local/bin/b2-python setup.py build \
 --build-base=${builddir}/build
 </build>
 
@@ -123,12 +123,12 @@ test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${EN
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages
-PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/lib/bcfg2/bin/python setup.py install \
+PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/bin/b2-python setup.py install \
 --prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
 </install>
 
 <clean>
-/usr/local/lib/bcfg2/bin/python setup.py clean
+/usr/local/bin/b2-python setup.py clean
 </clean>
 
 </source>
@@ -186,7 +186,7 @@ touch var/encap/${ENCAP_PKGNAME}
 ]]></prepackage>
 
 <include_file name="b2-regexplace.py" mode="0755"><![CDATA[
-#!/usr/local/lib/bcfg2/bin/python
+#!/usr/local/bin/b2-python
 
 # regexplace: regular expression search and replace
 # Stefano Spinucci
@@ -314,7 +314,7 @@ if __name__ == '__main__':
 
 BASEDIR="`echo ${0} | xargs -n1 dirname`"
 REGEXPLACE="${BASEDIR}/b2-regexplace.py"
-PYTHON="/usr/local/lib/bcfg2/bin/python"
+PYTHON="/usr/local/bin/b2-python"
 BINARIES="${REGEXPLACE} ${PYTHON}"
 COMPILEALL="/usr/local/lib/bcfg2/lib/python2.4/compileall.py"
 
@@ -364,15 +364,15 @@ printf "\nReplacing \"xmllint\" with \"/usr/local/bin/b2-xmllint\"...\n"
 ${REGEXPLACE} ${BASEDIR} .\* xmllint \/usr\/local\/bin\/b2-xmllint
 
 printf "\nReplacing \"#!/usr/bin/env python\" with "
-printf "\"#!/usr/local/lib/bcfg2/bin/python\"...\n"
-${REGEXPLACE} ${BASEDIR} .\* \#\!\/usr\/bin\/env\ python \#\!\/usr\/local\/lib\/bcfg2\/bin\/python
+printf "\"#!/usr/local/bin/b2-python\"...\n"
+${REGEXPLACE} ${BASEDIR} .\* \#\!\/usr\/bin\/env\ python \#\!\/usr\/local\/bin\/b2-python
 
 printf "\nReplacing \"#!/usr/bin/perl\" with \"#!/usr/bin/env perl\"...\n"
 ${REGEXPLACE} ${BASEDIR} .\* \#\!\/usr\/bin\/perl \#\!\/usr\/bin\/env\ perl
 
 printf "\nReplacing \"#!/usr/bin/python\" with "
-printf "\"#!/usr/local/lib/bcfg2/bin/python\"...\n"
-${REGEXPLACE} ${BASEDIR} .\* \#\!\/usr\/bin\/python \#\!\/usr\/local\/lib\/bcfg2\/bin\/python
+printf "\"#!/usr/local/bin/b2-python\"...\n"
+${REGEXPLACE} ${BASEDIR} .\* \#\!\/usr\/bin\/python \#\!\/usr\/local\/bin\/b2-python
 
 # For some reason this causes TLSSocketServerMixIn.py to be replaced with the contents of 
 # TLSSocketServerMixIn.pyc , which breaks things. Should figure out why and fix this for
diff --git a/encap/src/encap-profiles/bcfg2-cheetah-2.0rc8.ep b/encap/src/encap-profiles/bcfg2-cheetah-2.0rc8.ep
index 297578dd9..f58d82374 100644
--- a/encap/src/encap-profiles/bcfg2-cheetah-2.0rc8.ep
+++ b/encap/src/encap-profiles/bcfg2-cheetah-2.0rc8.ep
@@ -62,14 +62,14 @@ http://umn.dl.sourceforge.net/sourceforge/cheetahtemplate/Cheetah-2.0rc8.tar.gz"
 >
 
 <configure>
-/usr/local/lib/bcfg2/bin/python setup.py build_ext \
+/usr/local/bin/b2-python setup.py build_ext \
 -I/usr/local/lib/bcfg2/include \
 -L/usr/local/lib/bcfg2/lib \
 -L/usr/local/lib/bcfg2/lib/python2.4/site-packages
 </configure>
 
 <build>
-/usr/local/lib/bcfg2/bin/python setup.py build \
+/usr/local/bin/b2-python setup.py build \
 --build-base=${builddir}/build
 </build>
 
@@ -81,12 +81,12 @@ test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${EN
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages
-PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/lib/bcfg2/bin/python setup.py install \
+PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/bin/b2-python setup.py install \
 --prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
 </install> 
 
 <clean>
-/usr/local/lib/bcfg2/bin/python setup.py clean --all
+/usr/local/bin/b2-python setup.py clean --all
 </clean>
 
 </source>
diff --git a/encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep b/encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep
index 7c9479c8e..e91fe8443 100644
--- a/encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep
+++ b/encap/src/encap-profiles/bcfg2-elementtree-1.2.6.ep
@@ -39,7 +39,7 @@ http://effbot.org/downloads/elementtree-1.2.6-20050316.tar.gz"
 <configure type="unset" />
 
 <build>
-/usr/local/lib/bcfg2/bin/python setup.py build \
+/usr/local/bin/b2-python setup.py build \
 --build-base=${builddir}/build
 </build>
 
@@ -51,12 +51,12 @@ test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${EN
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages
-PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/lib/bcfg2/bin/python setup.py install \
+PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/bin/b2-python setup.py install \
 --prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
 </install>
 
 <clean>
-/usr/local/lib/bcfg2/bin/python setup.py clean
+/usr/local/bin/b2-python setup.py clean
 </clean>
 
 </source>
diff --git a/encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep b/encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep
index a7ad68ffa..6b7fb0481 100644
--- a/encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep
+++ b/encap/src/encap-profiles/bcfg2-m2crypto-0.17.ep
@@ -66,7 +66,7 @@ url="http://encapsrcdist/mirror/m2crypto/m2crypto-0.17.tar.gz
 >
 
 <configure>
-/usr/local/lib/bcfg2/bin/python setup.py build_ext \
+/usr/local/bin/b2-python setup.py build_ext \
 --openssl=/usr/local/lib/bcfg2 \
 -I/usr/local/lib/bcfg2/include/openssl \
 -I/usr/local/lib/bcfg2/include \
@@ -74,7 +74,7 @@ url="http://encapsrcdist/mirror/m2crypto/m2crypto-0.17.tar.gz
 </configure>
 
 <build>
-/usr/local/lib/bcfg2/bin/python setup.py build \
+/usr/local/bin/b2-python setup.py build \
 --build-base=${builddir}/build
 </build>
 
@@ -86,14 +86,14 @@ test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${EN
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages
-PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/lib/bcfg2/bin/python setup.py install \
+PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/bin/b2-python setup.py install \
 --prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 \
 --single-version-externally-managed \
 --record ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/python-install.log
 </install>
 
 <clean>
-/usr/local/lib/bcfg2/bin/python setup.py clean
+/usr/local/bin/b2-python setup.py clean
 </clean>
 
 </source>
diff --git a/encap/src/encap-profiles/bcfg2-python-apt-0.5.10.ep b/encap/src/encap-profiles/bcfg2-python-apt-0.5.10.ep
index 18aaff1da..a381cd433 100644
--- a/encap/src/encap-profiles/bcfg2-python-apt-0.5.10.ep
+++ b/encap/src/encap-profiles/bcfg2-python-apt-0.5.10.ep
@@ -63,14 +63,14 @@ subdir="python-apt-0.5.10"
 >
 
 <configure>
-/usr/local/lib/bcfg2/bin/python setup.py build_ext \
+/usr/local/bin/b2-python setup.py build_ext \
 -I/usr/local/lib/bcfg2/include \
 -L/usr/local/lib/bcfg2/lib \
 -L/usr/local/lib/bcfg2/lib/python2.4/site-packages
 </configure>
 
 <build>
-/usr/local/lib/bcfg2/bin/python setup.py build \
+/usr/local/bin/b2-python setup.py build \
 --build-base=${builddir}/build
 </build>
 
@@ -82,12 +82,12 @@ test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${EN
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages
-PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/lib/bcfg2/bin/python setup.py install \
+PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/bin/b2-python setup.py install \
 --prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
 </install> 
 
 <clean>
-/usr/local/lib/bcfg2/bin/python setup.py clean --all
+/usr/local/bin/b2-python setup.py clean --all
 </clean>
 
 </source>
diff --git a/encap/src/encap-profiles/bcfg2-python-apt-0.6.16.2ubuntu8.ep b/encap/src/encap-profiles/bcfg2-python-apt-0.6.16.2ubuntu8.ep
index dbe44a3c9..c85751dd4 100644
--- a/encap/src/encap-profiles/bcfg2-python-apt-0.6.16.2ubuntu8.ep
+++ b/encap/src/encap-profiles/bcfg2-python-apt-0.6.16.2ubuntu8.ep
@@ -63,14 +63,14 @@ subdir="python-apt-0.6.16.2ubuntu8"
 >
 
 <configure>
-/usr/local/lib/bcfg2/bin/python setup.py build_ext \
+/usr/local/bin/b2-python setup.py build_ext \
 -I/usr/local/lib/bcfg2/include \
 -L/usr/local/lib/bcfg2/lib \
 -L/usr/local/lib/bcfg2/lib/python2.4/site-packages
 </configure>
 
 <build>
-/usr/local/lib/bcfg2/bin/python setup.py build \
+/usr/local/bin/b2-python setup.py build \
 --build-base=${builddir}/build
 </build>
 
@@ -82,12 +82,12 @@ test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${EN
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages
-PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/lib/bcfg2/bin/python setup.py install \
+PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/bin/b2-python setup.py install \
 --prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
 </install> 
 
 <clean>
-/usr/local/lib/bcfg2/bin/python setup.py clean --all
+/usr/local/bin/b2-python setup.py clean --all
 </clean>
 
 </source>
diff --git a/encap/src/encap-profiles/bcfg2-python-apt-0.6.19.ep b/encap/src/encap-profiles/bcfg2-python-apt-0.6.19.ep
index 3638b412f..47fd51c9b 100644
--- a/encap/src/encap-profiles/bcfg2-python-apt-0.6.19.ep
+++ b/encap/src/encap-profiles/bcfg2-python-apt-0.6.19.ep
@@ -63,14 +63,14 @@ subdir="python-apt-0.6.19"
 >
 
 <configure>
-/usr/local/lib/bcfg2/bin/python setup.py build_ext \
+/usr/local/bin/b2-python setup.py build_ext \
 -I/usr/local/lib/bcfg2/include \
 -L/usr/local/lib/bcfg2/lib \
 -L/usr/local/lib/bcfg2/lib/python2.4/site-packages
 </configure>
 
 <build>
-/usr/local/lib/bcfg2/bin/python setup.py build \
+/usr/local/bin/b2-python setup.py build \
 --build-base=${builddir}/build
 </build>
 
@@ -82,12 +82,12 @@ test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${EN
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages
-PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/lib/bcfg2/bin/python setup.py install \
+PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/bin/b2-python setup.py install \
 --prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
 </install> 
 
 <clean>
-/usr/local/lib/bcfg2/bin/python setup.py clean --all
+/usr/local/bin/b2-python setup.py clean --all
 </clean>
 
 </source>
diff --git a/encap/src/encap-profiles/bcfg2-setuptools-0.6c6.ep b/encap/src/encap-profiles/bcfg2-setuptools-0.6c6.ep
index 3678a8dd5..34684060b 100644
--- a/encap/src/encap-profiles/bcfg2-setuptools-0.6c6.ep
+++ b/encap/src/encap-profiles/bcfg2-setuptools-0.6c6.ep
@@ -63,14 +63,14 @@ url="http://encapsrcdist/mirror/setuptools/setuptools-0.6c6.tar.gz
 >
 
 <configure>
-/usr/local/lib/bcfg2/bin/python setup.py build_ext \
+/usr/local/bin/b2-python setup.py build_ext \
 -I/usr/local/lib/bcfg2/include \
 -L/usr/local/lib/bcfg2/lib \
 -L/usr/local/lib/bcfg2/lib/python2.4/site-packages
 </configure>
 
 <build>
-/usr/local/lib/bcfg2/bin/python setup.py build \
+/usr/local/bin/b2-python setup.py build \
 --build-base=${builddir}/build
 </build>
 
@@ -82,12 +82,12 @@ test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${EN
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages
-PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/lib/bcfg2/bin/python setup.py install \
+PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/bin/b2-python setup.py install \
 --prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
 </install>
 
 <clean>
-/usr/local/lib/bcfg2/bin/python setup.py clean
+/usr/local/bin/b2-python setup.py clean
 </clean>
 
 </source>
diff --git a/encap/src/encap-profiles/bcfg2-swig-1.3.31.ep b/encap/src/encap-profiles/bcfg2-swig-1.3.31.ep
index 77fe058e0..2bfaf8497 100644
--- a/encap/src/encap-profiles/bcfg2-swig-1.3.31.ep
+++ b/encap/src/encap-profiles/bcfg2-swig-1.3.31.ep
@@ -81,7 +81,7 @@ url="http://encapsrcdist/mirror/swig/swig-1.3.31.tar.gz
   --prefix="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2" \
   --without-x \
   --without-tcl \
-  --with-python=/usr/local/lib/bcfg2/bin/python \
+  --with-python=/usr/local/bin/b2-python \
   --without-perl5 \
   --without-java \
   --without-gcj \
diff --git a/encap/src/encap-profiles/server/bcfg2-lxml-1.2.1.ep b/encap/src/encap-profiles/server/bcfg2-lxml-1.2.1.ep
index 70f570d8b..443638fec 100644
--- a/encap/src/encap-profiles/server/bcfg2-lxml-1.2.1.ep
+++ b/encap/src/encap-profiles/server/bcfg2-lxml-1.2.1.ep
@@ -67,7 +67,7 @@ url="http://encapsrcdist/mirror/lxml/lxml-1.2.1.tgz
 >
 
 <configure>
-/usr/local/lib/bcfg2/bin/python setup.py build_ext \
+/usr/local/bin/b2-python setup.py build_ext \
 -I/usr/local/lib/bcfg2/include \
 -L/usr/local/lib/bcfg2/lib \
 -lexslt \
@@ -75,7 +75,7 @@ url="http://encapsrcdist/mirror/lxml/lxml-1.2.1.tgz
 </configure>
 
 <build>
-/usr/local/lib/bcfg2/bin/python setup.py build \
+/usr/local/bin/b2-python setup.py build \
 --build-base=${builddir}/build
 </build>
 
@@ -87,14 +87,14 @@ test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${EN
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages
-PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/lib/bcfg2/bin/python setup.py install \
+PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/bin/b2-python setup.py install \
 --prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 \
 --single-version-externally-managed \
 --record ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/python-install.log
 </install>
 
 <clean>
-/usr/local/lib/bcfg2/bin/python setup.py clean
+/usr/local/bin/b2-python setup.py clean
 make clean
 </clean>
 
diff --git a/encap/src/encap-profiles/server/bcfg2-pyrex-0.9.5.1a.ep b/encap/src/encap-profiles/server/bcfg2-pyrex-0.9.5.1a.ep
index 3037e9e5e..c27d45af9 100644
--- a/encap/src/encap-profiles/server/bcfg2-pyrex-0.9.5.1a.ep
+++ b/encap/src/encap-profiles/server/bcfg2-pyrex-0.9.5.1a.ep
@@ -66,7 +66,7 @@ url="http://encapsrcdist/mirror/pyrex/Pyrex-0.9.5.1a.tar.gz
 </configure>
 
 <build>
-/usr/local/lib/bcfg2/bin/python setup.py build \
+/usr/local/bin/b2-python setup.py build \
 --build-base=${builddir}/build
 </build>
 
@@ -78,12 +78,12 @@ test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${EN
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4
 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages
-PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/lib/bcfg2/bin/python setup.py install \
+PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/bin/b2-python setup.py install \
 --prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2
 </install>
 
 <clean>
-/usr/local/lib/bcfg2/bin/python setup.py clean
+/usr/local/bin/b2-python setup.py clean
 </clean>
 
 </source>
-- 
cgit v1.2.3-1-g7c22