summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Marc-Antoine Perennou <keruspe@exherbo.org> 2015-04-05 09:33:54 +0200
committerAvatar Marc-Antoine Perennou <keruspe@exherbo.org> 2015-04-05 09:33:54 +0200
commita597ba083dc48d7d3b52bca8a21d2e848ee90e29 (patch)
tree9f40661c38eedfcebe11852afe0f3a72e7a688b0
parent9b24751eaf62e6707238eb36bf6373031a9d3480 (diff)
downloadtexlive-a597ba083dc48d7d3b52bca8a21d2e848ee90e29.tar.gz
texlive-a597ba083dc48d7d3b52bca8a21d2e848ee90e29.tar.xz
texlive-common: adjust paths for cross
Signed-off-by: Marc-Antoine Perennou <keruspe@exherbo.org>
-rw-r--r--exlibs/texlive-common.exlib16
1 files changed, 8 insertions, 8 deletions
diff --git a/exlibs/texlive-common.exlib b/exlibs/texlive-common.exlib
index d57d9a0..29547e0 100644
--- a/exlibs/texlive-common.exlib
+++ b/exlibs/texlive-common.exlib
@@ -86,13 +86,13 @@ texlive-common_do_symlinks() {
*)
if [[ $1 == $2 ]]; then
echo "Symlink $1 -> $2 skipped"
- elif [[ -e ${IMAGE}/usr/bin/$1 ]]; then
+ elif [[ -e ${IMAGE}/usr/$(exhost --target)/bin/$1 ]]; then
echo "Symlink $1 skipped (file exists)"
else
echo "Making symlink from $1 to $2"
# make sure bindir actually exists
- dodir /usr/bin
- dosym $2 /usr/bin/$1
+ dodir /usr/$(exhost --target)/bin
+ dosym $2 /usr/$(exhost --target)/bin/$1
fi
;;
esac
@@ -127,7 +127,7 @@ dobin_texmf_scripts() {
trg=${trg,,}
echo "Installing ${x} as ${trg} bin wrapper"
[[ -x ${IMAGE}/usr/share/${x} ]] || die "Trying to install a non existing or non executable symlink to /usr/bin: ${x}"
- dosym ../share/${x} /usr/bin/${trg}
+ dosym ../share/${x} /usr/$(exhost --target)/bin/${trg}
shift
done
}
@@ -138,10 +138,10 @@ dobin_texmf_scripts() {
# function helps in factorizing some code.
etexmf-update() {
if has_version 'app-text/texlive-core' ; then
- if [[ ${ROOT} == / && -x /usr/sbin/texmf-update ]]; then
+ if [[ ${ROOT} == / && -x /usr/$(exhost --target)/bin/texmf-update ]]; then
nonfatal edo touch /usr/share/texmf-dist/tex/generic/config/language.{dat,dat.lua,def} ||
eerror "touch for texmf-update failed"
- nonfatal edo /usr/sbin/texmf-update || eerror "texmf-update failed"
+ nonfatal edo /usr/$(exhost --target)/bin/texmf-update || eerror "texmf-update failed"
else
ewarn "Cannot run texmf-update for some reason."
ewarn "Your texmf tree might be inconsistent with your configuration"
@@ -156,9 +156,9 @@ etexmf-update() {
# function helps in factorizing some code.
efmtutil-sys() {
if has_version 'app-text/texlive-core' ; then
- if [[ ${ROOT} == / && -x /usr/bin/fmtutil-sys ]]; then
+ if [[ ${ROOT} == / && -x /usr/$(exhost --target)/bin/fmtutil-sys ]]; then
echo "Rebuilding formats"
- nonfatal edo /usr/bin/fmtutil-sys --all &> /dev/null ||
+ nonfatal edo /usr/$(exhost --target)/bin/fmtutil-sys --all &> /dev/null ||
eerror "fmtutil-sys --all failed"
else
ewarn "Cannot run fmtutil-sys for some reason."