summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeonardo Boshell <leonardop@gentoo.org>2005-08-03 07:35:50 +0000
committerLeonardo Boshell <leonardop@gentoo.org>2005-08-03 07:35:50 +0000
commit272cc2067d367e5ab3dc8049b5da91d28fc83716 (patch)
tree76c6bf62fed1e0f45a5ca3b5549e2f9a9a06b0ea /eclass/gnome2.eclass
parentSplitting into versions 0.12 and 2.6.x. Don't inherit from gtk-engines2.eclas... (diff)
downloadhistorical-272cc2067d367e5ab3dc8049b5da91d28fc83716.tar.gz
historical-272cc2067d367e5ab3dc8049b5da91d28fc83716.tar.bz2
historical-272cc2067d367e5ab3dc8049b5da91d28fc83716.zip
* gnome2.eclass: Added extra checks so global variables don't get rewritten
every time the eclass is parsed (gnome2_src_configure): Moved 'use debug' logic from the global scope.
Diffstat (limited to 'eclass/gnome2.eclass')
-rw-r--r--eclass/gnome2.eclass21
1 files changed, 15 insertions, 6 deletions
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index ad84f9b76abe..6f03b620a64d 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.58 2005/08/01 23:20:55 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.59 2005/08/03 07:35:50 leonardop Exp $
#
# Authors:
# Bruce A. Locke <blocke@shivan.org>
@@ -10,14 +10,21 @@ inherit libtool gnome.org debug fdo-mime
# Gnome 2 ECLASS
-G2CONF="" # extra configure opts passed to econf
-ELTCONF="" # extra options passed to elibtoolize
-SCROLLKEEPER_UPDATE="1" # whether to run scrollkeeper for this package
-USE_DESTDIR="" # use make DESTDIR=${D} install rather than einstall
+# extra configure opts passed to econf
+[ -z "$G2CONF" ] && G2CONF=""
+
+# extra options passed to elibtoolize
+[ -z "$ELTCONF" ] && ELTCONF=""
+
+# whether to run scrollkeeper for this package
+[ -z "$SCROLLKEEPER_UPDATE" ] && SCROLLKEEPER_UPDATE="1"
+
+# use make DESTDIR=${D} install rather than einstall
+[ -z "$USE_DESTDIR" ] && USE_DESTDIR=""
+
IUSE="debug"
-use debug && G2CONF="${G2CONF} --enable-debug=yes"
DEPEND=">=sys-apps/sed-4"
@@ -26,6 +33,8 @@ gnome2_src_configure() {
# [ -n "${ELTCONF}" ] && elibtoolize ${ELTCONF}
elibtoolize ${ELTCONF}
+ use debug && G2CONF="${G2CONF} --enable-debug=yes"
+
# doc keyword for gtk-doc
G2CONF="${G2CONF} $(use_enable doc gtk-doc)"