diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2005-03-30 14:12:25 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2005-03-30 14:12:25 +0000 |
| commit | 04e0d0f0860b46794682f52307b4f69557296b6b (patch) | |
| tree | 79e83eff1f1261b07ae297ba9ac4673079e038ae /eclass/eutils.eclass | |
| parent | Fix for bug #81835 (diff) | |
| download | gentoo-2-04e0d0f0860b46794682f52307b4f69557296b6b.tar.gz gentoo-2-04e0d0f0860b46794682f52307b4f69557296b6b.tar.bz2 gentoo-2-04e0d0f0860b46794682f52307b4f69557296b6b.zip | |
Added an optional path element to make_wrapper.
Diffstat (limited to 'eclass/eutils.eclass')
| -rw-r--r-- | eclass/eutils.eclass | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index 460fc2e368c7..dbe851ca9ac5 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.163 2005/03/26 06:33:16 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.164 2005/03/30 14:12:25 wolf31o2 Exp $ # # Author: Martin Schlemmer <azarah@gentoo.org> # @@ -1765,8 +1765,9 @@ newpamd() { # $2 == binary to run # $3 == directory to chdir before running binary # $4 == extra LD_LIBRARY_PATH's (make it : delimited) +# $5 == path for wrapper make_wrapper() { - local wrapper=$1 bin=$2 chdir=$3 libdir=$4 + local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 local tmpwrapper=$(emktemp) cat << EOF > "${tmpwrapper}" #!/bin/sh @@ -1775,5 +1776,11 @@ export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" exec ${bin} "\$@" EOF chmod go+rx "${tmpwrapper}" - newbin "${tmpwrapper}" "${wrapper}" + if [ -n "${5}" ] + then + exeinto ${5} + newexe "${tmpwrapper}" "${wrapper}" + else + newbin "${tmpwrapper}" "${wrapper}" + fi } |