From e9b9af550004daf7837a9009cd05dbab51a85509 Mon Sep 17 00:00:00 2001 From: Loïc Minier Date: Tue, 5 Jan 2010 10:49:01 +0100 Subject: Make satisfydepends-aptitude, -classic relocatable Make pbuilder-satisfydepends-aptitude and -classic relocatable. --- pbuilder-satisfydepends-aptitude | 7 +++++-- pbuilder-satisfydepends-classic | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pbuilder-satisfydepends-aptitude b/pbuilder-satisfydepends-aptitude index 1031497..9ddabee 100755 --- a/pbuilder-satisfydepends-aptitude +++ b/pbuilder-satisfydepends-aptitude @@ -21,7 +21,10 @@ set -e -. /usr/lib/pbuilder/pbuilder-satisfydepends-funcs +export PBUILDER_PKGLIBDIR="${PBUILDER_PKGLIBDIR:-$PBUILDER_ROOT/usr/lib/pbuilder}" + +. "$PBUILDER_PKGLIBDIR"/pbuilder-satisfydepends-funcs + # filter out dependencies sent on input not for this arch; deps can have # multiple lines; output is on a single line or "" if empty @@ -114,5 +117,5 @@ Copyright 2002-2007 Junichi Uekawa EOF } -. /usr/lib/pbuilder/pbuilder-satisfydepends-checkparams +. "$PBUILDER_PKGLIBDIR"/pbuilder-satisfydepends-checkparams diff --git a/pbuilder-satisfydepends-classic b/pbuilder-satisfydepends-classic index f15af79..79a4bc9 100755 --- a/pbuilder-satisfydepends-classic +++ b/pbuilder-satisfydepends-classic @@ -22,7 +22,9 @@ set -e -. /usr/lib/pbuilder/pbuilder-satisfydepends-funcs +export PBUILDER_PKGLIBDIR="${PBUILDER_PKGLIBDIR:-$PBUILDER_ROOT/usr/lib/pbuilder}" + +. "$PBUILDER_PKGLIBDIR"/pbuilder-satisfydepends-funcs function checkbuilddep_internal () { # Use this function to fulfill the dependency (almost) @@ -168,5 +170,5 @@ Copyright 2002-2007 Junichi Uekawa EOF } -. /usr/lib/pbuilder/pbuilder-satisfydepends-checkparams +. "$PBUILDER_PKGLIBDIR"/pbuilder-satisfydepends-checkparams -- cgit v1.2.3