moved pbuilderrc loading to the main file.

5 files changed, 4 insertions, 5 deletions

diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index 5d63436..74b890d 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -26,8 +26,6 @@ function checkbuilddep () {
     done;
 }
 
-
-. /etc/pbuilderrc
 . /usr/lib/pbuilder/pbuilder-checkparams
 PACKAGENAME="$1"
 CHROOTEXEC="chroot $BUILDPLACE "
diff --git a/pbuilder-checkparams b/pbuilder-checkparams
index ace5624..19f79d8 100755
--- a/pbuilder-checkparams
+++ b/pbuilder-checkparams
@@ -1,6 +1,8 @@
 #! /bin/bash 
 # this is sourced from pbuilder packages to process the optional parameters.
 
+. /etc/pbuilderrc
+
 while [ -n $1 ]; do
   case "$1" in 
     --basetgz) 
diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv
index 861e191..87990be 100755
--- a/pbuilder-createbuildenv
+++ b/pbuilder-createbuildenv
@@ -3,8 +3,8 @@
 export LANG=C
 export LC_ALL=C
 
-. /etc/pbuilderrc
 . /usr/lib/pbuilder/pbuilder-checkparams
+
 CHROOTEXEC="chroot $BUILDPLACE "
 if [ -z "$DISTRIBUTION" ]; then
   DISTRIBUTION=woody
diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv
index 510f34c..02eb238 100755
--- a/pbuilder-updatebuildenv
+++ b/pbuilder-updatebuildenv
@@ -2,7 +2,6 @@
 export LANG=C
 export LC_ALL=C
 
-. /etc/pbuilderrc
 . /usr/lib/pbuilder/pbuilder-checkparams
 CHROOTEXEC="chroot $BUILDPLACE "
 
diff --git a/pbuilderrc b/pbuilderrc
index 4b3030a..44bb5a6 100755
--- a/pbuilderrc
+++ b/pbuilderrc
@@ -2,6 +2,6 @@
 BASETGZ=/var/cache/pbuilder/base.tgz
 #EXTRAPACKAGES=gcc3.0-athlon-builder
 #export DEBIAN_BUILDARCH=athlon
-BUILDPLACE=/var/cache/pbuilder/build/$$/
+BUILDPLACE=/var/cache/pbuilder/build/
 MIRRORSITE=http://www.jp.debian.org/debian
 #export http_proxy=http://your-proxy:8080/