From 7a81e85ddb2dcb03d29d623b43ffa856383be299 Mon Sep 17 00:00:00 2001
From: Kito <kito@gentoo.org>
Date: Wed, 1 Feb 2006 05:18:22 +0000
Subject: [PATCH] fix trailing/leading slashes for dosym and prepinfo. Add  to
 default CONFIG_PROTECT in make.globals

svn path=/main/branches/prefix/; revision=2613
---
 bin/dosym        | 3 +--
 bin/prepinfo     | 2 +-
 cnf/make.globals | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/bin/dosym b/bin/dosym
index 956ef7bb9..18efade4f 100755
--- 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 fa44a086c..a414f58ec 100755
--- 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 cd34f8447..c6e79b1c3 100644
--- 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"
-- 
2.26.2