aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Benedikt Morbach <moben@exherbo.org> 2015-03-19 02:07:26 +0100
committerAvatar Gerrit Code Review <tomcat@galileo.mailstation.de> 2015-04-01 00:05:57 +0200
commit014406f270f4f2744f75deccb0acd45982d5aedc (patch)
tree8b3b277834aba17776badd5fb9961f32e7583bb7
parentdccb65acba7684c97675473fec5120e3aa55d2d0 (diff)
downloadpaludis-014406f270f4f2744f75deccb0acd45982d5aedc.tar.gz
paludis-014406f270f4f2744f75deccb0acd45982d5aedc.tar.xz
merge sbin into bin when FILESYSTEM_LAYOUT == cross
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/build_functions.bash12
1 files changed, 11 insertions, 1 deletions
diff --git a/paludis/repositories/e/ebuild/exheres-0/build_functions.bash b/paludis/repositories/e/ebuild/exheres-0/build_functions.bash
index d5c69b5..eb23ef1 100644
--- a/paludis/repositories/e/ebuild/exheres-0/build_functions.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/build_functions.bash
@@ -127,6 +127,10 @@ econf()
econf_args+=( "${i}" )
done
+ if [[ ${FILESYSTEM_LAYOUT} == cross ]] ; then
+ local bindir=bin
+ fi
+
local j default_args=()
for i in \
--prefix=/usr \
@@ -142,7 +146,9 @@ econf()
--disable-dependency-tracking \
--disable-silent-rules \
--enable-fast-install \
- --libdir=${ECONF_PREFIX}/${LIBDIR:-lib}; do
+ --libdir=${ECONF_PREFIX}/${LIBDIR:-lib} \
+ --bindir=${ECONF_PREFIX}/${bindir:-bin} \
+ --sbindir=${ECONF_PREFIX}/${bindir:-sbin}; do
j=${i%%=*}
has ${j#--} ${hates} || default_args+=( "${i}" )
done
@@ -173,6 +179,10 @@ einstall()
cmd="${cmd} sysconfdir=${IMAGE}/etc"
cmd="${cmd} localstatedir=${IMAGE}/var/lib"
cmd="${cmd} libdir=${IMAGE}/usr/${LIBDIR:-lib}"
+ if [[ ${FILESYSTEM_LAYOUT} == cross ]] ; then
+ cmd="${cmd} bindir=${IMAGE}/usr/$(exhost --target)/bin"
+ cmd="${cmd} sbindir=${IMAGE}/usr/$(exhost --target)/bin"
+ fi
cmd="${cmd} ${@} install"
echo "${cmd}" 1>&2
${cmd} || paludis_die_unless_nonfatal "einstall failed" || return 247