diff options
| author | Loïc Minier <lool@dooz.org> | 2010-01-05 10:49:01 +0100 |
|---|---|---|
| committer | Loïc Minier <lool@dooz.org> | 2010-01-05 10:49:01 +0100 |
| commit | e9b9af550004daf7837a9009cd05dbab51a85509 (patch) | |
| tree | 8b758baf79e01c3f6af39423aff17e6e3368be87 | |
| parent | c4933629883a8e4118f2b370cc549b404c98e2cf (diff) | |
| download | pbuilder-e9b9af550004daf7837a9009cd05dbab51a85509.tar pbuilder-e9b9af550004daf7837a9009cd05dbab51a85509.tar.gz | |
Make satisfydepends-aptitude, -classic relocatable
Make pbuilder-satisfydepends-aptitude and -classic relocatable.
| -rwxr-xr-x | pbuilder-satisfydepends-aptitude | 7 | ||||
| -rwxr-xr-x | 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 <dancer@debian.org> 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 <dancer@debian.org> EOF } -. /usr/lib/pbuilder/pbuilder-satisfydepends-checkparams +. "$PBUILDER_PKGLIBDIR"/pbuilder-satisfydepends-checkparams |