change DOCDESTTREE to _E_DOCDESTTREE_ to try and prevent abuse from ebuild writers...

svn path=/main/branches/2.1.2/; revision=6902

diff --git a/bin/dodoc b/bin/dodoc
index 4139cb593b3e218a0ced3649f6a9a29aabb20964..0c6b42a0219c0c6e27286f70bfd1a2f7246a37a1 100755 (executable)
--- a/bin/dodoc
+++ b/bin/dodoc
@@ -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

diff --git a/bin/dohtml b/bin/dohtml
index cdffad645ccb45b86f32c7e147dbfd4e61409d12..917ca1b52bd1db58a10c8388aa19dbb539d3a274 100755 (executable)
--- a/bin/dohtml
+++ b/bin/dohtml
@@ -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 6ea33964ce9048b39118793d048d54eab6ca0831..a7d5fd8717edd4e65b1275f71aa844ab7e16f52f 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -354,7 +354,7 @@ umask 022
 export DESTTREE=/usr
 export INSDESTTREE=""
 export EXEDESTTREE=""
-export DOCDESTTREE=""
+export _E_DOCDESTTREE_=""
 export INSOPTIONS="-m0644"
 export EXEOPTIONS="-m0755"
 export LIBOPTIONS="-m0644"
@@ -848,11 +848,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
 }