diff options
| author |   Dan Armak <danarmak@gentoo.org> | 2002-08-17 10:02:54 +0000 |
|---|---|---|
| committer | Dan Armak <danarmak@gentoo.org> | 2002-08-17 10:02:54 +0000 |
| commit | 12205f71116c8a59206ba2c28ab9c3a370aa444d (patch) | |
| tree | 0074c48364bffc7d3c12ea0257517c8eff6941bd /app-office/siag | |
| parent | unmasked cdrtools and commonbox stuff (diff) | |
| download | historical-12205f71116c8a59206ba2c28ab9c3a370aa444d.tar.gz historical-12205f71116c8a59206ba2c28ab9c3a370aa444d.tar.bz2 historical-12205f71116c8a59206ba2c28ab9c3a370aa444d.zip | |
use kde-functions.eclass to determine properly the location where kde menu items should be installed
Diffstat (limited to 'app-office/siag')
| -rw-r--r-- | app-office/siag/ChangeLog | 9 | ||||
| -rw-r--r-- | app-office/siag/siag-3.5.2-r2.ebuild | 13 |
2 files changed, 14 insertions, 8 deletions
diff --git a/app-office/siag/ChangeLog b/app-office/siag/ChangeLog index 0aecfbff0b10..26a9d76cca6b 100644 --- a/app-office/siag/ChangeLog +++ b/app-office/siag/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/siag -# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/app-office/siag/ChangeLog,v 1.4 2002/06/17 22:18:09 lostlogic Exp $ +# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/siag/ChangeLog,v 1.5 2002/08/17 10:02:54 danarmak Exp $ + + 17 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog : + + Use kde-functions.eclass to determine the proper prefix for installing + KDE menu items. *siag-3.5.2 (5 Jun 2002) diff --git a/app-office/siag/siag-3.5.2-r2.ebuild b/app-office/siag/siag-3.5.2-r2.ebuild index 0b1dbb06317b..20eb977733f7 100644 --- a/app-office/siag/siag-3.5.2-r2.ebuild +++ b/app-office/siag/siag-3.5.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/app-office/siag/siag-3.5.2-r2.ebuild,v 1.4 2002/08/01 13:09:06 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/siag/siag-3.5.2-r2.ebuild,v 1.5 2002/08/17 10:02:54 danarmak Exp $ S=${WORKDIR}/${P} DESCRIPTION="A free Office package for Linux" @@ -21,12 +21,14 @@ DEPEND="virtual/x11 RDEPEND="virtual/x11" # >=media-libs/t1lib-1.0.1" +if [ -n "`use kde`" ]; then inherit kde-functions; set-kdedir 3; fi + src_unpack() { unpack ${A} cd ${S} - if [ -z "`use kde`" ] || [ -z ${KDEDIR} ]; then + if [ -z "`use kde`" ]; then einfo "Not using KDE" for file in `find . -iname "Makefile.*"`; do grep -v "kdeinst" ${file} >${file}.hacked && \ @@ -34,7 +36,7 @@ src_unpack() { done else einfo "Using KDE" - sed -e "s:VERBOSE=no:VERBOSE=no\nKDEDIR=${D}${KDEDIR}:" common/kdeinst \ + sed -e "s:VERBOSE=no:VERBOSE=no\nKDEDIR=${D}/${PREFIX}:" common/kdeinst \ > common/kdeinst.hacked && \ mv common/kdeinst.hacked common/kdeinst || die "Hacking of kdeinst failed" fi @@ -65,9 +67,8 @@ src_compile() { src_install () { - if [ -n "`use kde`" ] && [ ! -z ${KDEDIR} ]; then - echo "Still using KDE" - dodir ${KDEDIR} + if [ -n "`use kde`" ]; then + dodir ${PREFIX} fi make DESTDIR=${D} install || die "Install failed" |