manually merge differences with the trunk

svn path=/main/branches/prefix/; revision=10305

diff --git a/bin/dolib.a b/bin/dolib.a
index a1cc01641d4c03455df7082898a09c14c9c048be..22c5705878605a998fec2426e67e5188b09df955 100755 (executable)
--- a/bin/dolib.a
+++ b/bin/dolib.a
@@ -3,5 +3,5 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-exec env LIBOPTIONS="-m 0644" \
+exec env LIBOPTIONS="-m0644" \
        dolib "$@"

diff --git a/bin/dolib.so b/bin/dolib.so
index 6dae7d052bbd1ffe12eca8193baf490f8aee5de8..63baaae00ab3da4dbee50c011fd75b33d7d38623 100755 (executable)
--- a/bin/dolib.so
+++ b/bin/dolib.so
@@ -3,5 +3,5 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-exec env LIBOPTIONS="-m 0755" \
+exec env LIBOPTIONS="-m0755" \
        dolib "$@"

diff --git a/bin/dosbin b/bin/dosbin
index e454aa777138f349502cd73bb4ebe9107f74709b..c2b1eb06369b51099fe057443dc61b51f51324fd 100755 (executable)
--- a/bin/dosbin
+++ b/bin/dosbin
@@ -16,7 +16,7 @@ ret=0
 
 for x in "$@" ; do
        if [[ -e ${x} ]] ; then
-               install -m 0755 -o ${PORTAGE_INST_UID:-0} -g ${PORTAGE_INST_GID:-0} "${x}" "${ED}${DESTTREE}/sbin"
+               install -m0755 -o ${PORTAGE_INST_UID:-0} -g ${PORTAGE_INST_GID:-0} "${x}" "${ED}${DESTTREE}/sbin"
        else
                echo "!!! ${0##*/}: ${x} does not exist" 1>&2
                false