vapier 15/02/09 15:14:52 Modified: binutils-config-4 Log: Fix by Ruud Koolen for ROOT handling with man/info paths #532610 by Ruud Koolen. (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.3 sys-devel/binutils-config/files/binutils-config-4 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils-config/files/binutils-config-4?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils-config/files/binutils-config-4?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/binutils-config/files/binutils-config-4?r1=1.2&r2=1.3 Index: binutils-config-4 =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-4,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- binutils-config-4 30 Dec 2014 15:10:36 -0000 1.2 +++ binutils-config-4 9 Feb 2015 15:14:52 -0000 1.3 @@ -1,7 +1,7 @@ #!/bin/bash -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-4,v 1.2 2014/12/30 15:10:36 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-4,v 1.3 2015/02/09 15:14:52 vapier Exp $ # Format of /etc/env.d/binutils/: # config-TARGET: CURRENT=version for TARGET @@ -170,8 +170,8 @@ local e="${ROOT}"/etc/env.d/05binutils local ee="${e}.tmp" rm -f "${ee}" - [[ -d ${DATAPATH}/man ]] && echo "MANPATH=${DATAPATH}/man" >> "${ee}" - [[ -d ${DATAPATH}/info ]] && echo "INFOPATH=${DATAPATH}/info" >> "${ee}" + [[ -d ${ROOT}/${DATAPATH}/man ]] && echo "MANPATH=${DATAPATH}/man" >> "${ee}" + [[ -d ${ROOT}/${DATAPATH}/info ]] && echo "INFOPATH=${DATAPATH}/info" >> "${ee}" # hmm, `ld` has this in SEARCH_DIR(), but ld.so does not ... if [[ -d ${ROOT}/etc/ld.so.conf.d ]] ; then local l="${ROOT}"/etc/ld.so.conf.d/05binutils.conf @@ -384,7 +384,7 @@ -h|--help) usage 0 ;; -V|--version) unset Header - cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-4,v 1.2 2014/12/30 15:10:36 blueness Exp $" + cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-4,v 1.3 2015/02/09 15:14:52 vapier Exp $" cvsver=${cvsver##*binutils-config-} bver=${cvsver%%,v *} cvsver=${cvsver#* }
