fix trailing/leading slashes for dosym and prepinfo. Add to default CONFIG_PROTECT...

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

diff --git a/bin/dosym b/bin/dosym
index 956ef7bb9409dc2fca29b4812b0f41bd93f9261c..18efade4f94288cfa6237c29a78014e53b1920b5 100755 (executable)
--- a/bin/dosym
+++ b/bin/dosym
@@ -8,9 +8,8 @@ if [[ $# -ne 2 ]] ; then
        exit 1
 fi
 
-<<<<<<< .working
 target="${1}"
 linkname="${2}"
 [[ ${target:0:1} == "/" ]] && target="${PREFIX}${target}"
-exec ln -snf "${target}" "${D}${linkname}"
+exec ln -snf "${target}" "${D}/${linkname}"
 

diff --git a/bin/prepinfo b/bin/prepinfo
index fa44a086c718a55d60427d4aa36651beac39e69d..a414f58ec97eaf7569cf9330f527bee24b8e7fe1 100755 (executable)
--- a/bin/prepinfo
+++ b/bin/prepinfo
@@ -4,7 +4,7 @@
 # $Id: /var/cvsroot/gentoo-src/portage/bin/prepinfo,v 1.6.2.1 2005/05/29 12:40:08 jstubbs Exp $
 
 if [ -z "$1" ] ; then
-       z="${D}usr/share/info"
+       z="${D}/usr/share/info"
 else
        if [ -d "${D}$1/share/info" ] ; then
                z="${D}$1/share/info"

diff --git a/cnf/make.globals b/cnf/make.globals
index cd34f8447652a771b0e4fa18e122d62b405b7d5f..c6e79b1c3e469ef713cdfe58b94e228922d0a66b 100644 (file)
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -55,7 +55,7 @@ RSYNC_RETRIES="3"
 RSYNC_TIMEOUT="180"
 
 # Minimal CONFIG_PROTECT
-CONFIG_PROTECT="/etc"
+CONFIG_PROTECT="${PREFIX}/etc"
 
 # Disable auto-use
 USE_ORDER="env:pkg:conf:defaults"