summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2004-10-25 02:29:18 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2004-10-25 02:29:18 +0000
commitcbe7d6af919d7259aac5a8b9abb301d4849c180e (patch)
treeb87494036d410f25cb6bf244ab8ab26f972d3eb3 /eclass/nsplugins.eclass
parentun-pmask baselayout-1.11.x (diff)
downloadhistorical-cbe7d6af919d7259aac5a8b9abb301d4849c180e.tar.gz
historical-cbe7d6af919d7259aac5a8b9abb301d4849c180e.tar.bz2
historical-cbe7d6af919d7259aac5a8b9abb301d4849c180e.zip
get_libdir fixes for bug #68749.
Diffstat (limited to 'eclass/nsplugins.eclass')
-rw-r--r--eclass/nsplugins.eclass28
1 files changed, 15 insertions, 13 deletions
diff --git a/eclass/nsplugins.eclass b/eclass/nsplugins.eclass
index e6a3054e4eb3..fd30322d7e31 100644
--- a/eclass/nsplugins.eclass
+++ b/eclass/nsplugins.eclass
@@ -1,11 +1,13 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/nsplugins.eclass,v 1.14 2004/06/25 00:39:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/nsplugins.eclass,v 1.15 2004/10/25 02:29:18 eradicator Exp $
#
# Author: Martin Schlemmer <azarah@gentoo.org>
#
# Just some re-usable functions for the netscape/moz plugins sharing
+inherit eutils
+
ECLASS=nsplugins
INHERITED="$INHERITED $ECLASS"
@@ -14,28 +16,28 @@ DESCRIPTION="Based on the ${ECLASS} eclass"
PLUGINS_DIR="nsbrowser/plugins"
# This function move the plugin dir in src_install() to
-# ${D}/usr/lib/${PLUGIN_DIR}. First argument should be
+# ${D}/usr/$(get_libdir)/${PLUGIN_DIR}. First argument should be
# the full path (without $D) to old plugin dir.
src_mv_plugins() {
# Move plugins dir. We use keepdir so that it might not be unmerged
# by mistake ...
- keepdir /usr/lib/${PLUGINS_DIR}
- cp -a ${D}/$1/* ${D}/usr/lib/${PLUGINS_DIR}
+ keepdir /usr/$(get_libdir)/${PLUGINS_DIR}
+ cp -a ${D}/$1/* ${D}/usr/$(get_libdir)/${PLUGINS_DIR}
rm -rf ${D}/$1
- dosym /usr/lib/${PLUGINS_DIR} $1
+ dosym /usr/$(get_libdir)/${PLUGINS_DIR} $1
}
# This function move plugins in pkg_preinst() in old dir to
-# ${ROOT}//usr/lib/${PLUGIN_DIR}. First argument should be
+# ${ROOT}/usr/$(get_libdir)/${PLUGIN_DIR}. First argument should be
# the full path (without $ROOT) to old plugin dir.
pkg_mv_plugins() {
# Move old plugins dir
if [ -d "${ROOT}/$1" -a ! -L "${ROOT}/$1" ]
then
- mkdir -p ${ROOT}/usr/lib/${PLUGINS_DIR}
- cp -a ${ROOT}/$1/* ${ROOT}/usr/lib/${PLUGINS_DIR}
+ mkdir -p ${ROOT}/usr/$(get_libdir)/${PLUGINS_DIR}
+ cp -a ${ROOT}/$1/* ${ROOT}/usr/$(get_libdir)/${PLUGINS_DIR}
rm -rf ${ROOT}/$1
fi
}
@@ -47,13 +49,13 @@ inst_plugin() {
MYFILE="`echo ${1} | gawk -F '/' '{ print $NF }'`"
# Install the plugin if none is installed
- if [ ! -L "/usr/lib/${PLUGINS_DIR}/${MYFILE}" ]
+ if [ ! -L "/usr/$(get_libdir)/${PLUGINS_DIR}/${MYFILE}" ]
then
- dodir /usr/lib/${PLUGINS_DIR}
+ dodir /usr/$(get_libdir)/${PLUGINS_DIR}
# $ROOT should only be used in pkg_*() functions ...
- # dosym ${1} ${ROOT}/usr/lib/${PLUGINS_DIR}
- echo dosym ${1} /usr/lib/${PLUGINS_DIR}
- dosym ${1} /usr/lib/${PLUGINS_DIR}
+ # dosym ${1} ${ROOT}/usr/$(get_libdir)/${PLUGINS_DIR}
+ echo dosym ${1} /usr/$(get_libdir)/${PLUGINS_DIR}
+ dosym ${1} /usr/$(get_libdir)/${PLUGINS_DIR}
einfo "Symlinked the plugin into the mozilla/firebird/galeon plugin directory"
else
einfo "Not creating symlink for the plugin, because one already exists"