diff options
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/dodoc | 2 | ||||
| -rwxr-xr-x | bin/dohtml | 4 | ||||
| -rwxr-xr-x | bin/ebuild.sh | 11 |
3 files changed, 9 insertions, 8 deletions
@@ -8,7 +8,7 @@ if [ $# -lt 1 ] ; then exit 1 fi -dir="${D}usr/share/doc/${PF}/${DOCDESTTREE}" +dir="${D}usr/share/doc/${PF}/${_E_DOCDESTTREE_}" if [ ! -d "${dir}" ] ; then install -d "${dir}" fi @@ -77,8 +77,8 @@ class OptionsClass: self.PF = os.environ["PF"] if os.environ.has_key("D"): self.D = os.environ["D"] - if os.environ.has_key("DOCDESTTREE"): - self.DOCDESTTREE = os.environ["DOCDESTTREE"] + if os.environ.has_key("_E_DOCDESTTREE_"): + self.DOCDESTTREE = os.environ["_E_DOCDESTTREE_"] self.allowed_exts = [ 'png', 'gif', 'html', 'htm', 'jpg', 'css', 'js' ] self.allowed_files = [] diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 7951619c..8f866d7b 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -271,7 +271,7 @@ umask 022 export DESTTREE=/usr export INSDESTTREE="" export EXEDESTTREE="" -export DOCDESTTREE="" +export _E_DOCDESTTREE_="" export INSOPTIONS="-m0644" export EXEOPTIONS="-m0755" export LIBOPTIONS="-m0644" @@ -761,11 +761,12 @@ exeinto() { docinto() { if [ "$1" == "/" ]; then - export DOCDESTTREE="" + export _E_DOCDESTTREE_="" + eqawarn "QA Notice: invalid usage of docinto" else - export DOCDESTTREE="$1" - if [ ! -d "${D}usr/share/doc/${PF}/${DOCDESTTREE}" ]; then - install -d "${D}usr/share/doc/${PF}/${DOCDESTTREE}" + export _E_DOCDESTTREE_="$1" + if [ ! -d "${D}usr/share/doc/${PF}/${_E_DOCDESTTREE_}" ]; then + install -d "${D}usr/share/doc/${PF}/${_E_DOCDESTTREE_}" fi fi } |