summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Knight <tomk@gentoo.org>2006-10-12 13:41:10 +0000
committerTom Knight <tomk@gentoo.org>2006-10-12 13:41:10 +0000
commita1f343da8c2fbbb40c3a7248cebc682b11c25c95 (patch)
treed2956557f7e6224f7c092bc7dd3ead8286d374db /eclass/apache-module.eclass
parentStable on sparc (diff)
downloadgentoo-2-a1f343da8c2fbbb40c3a7248cebc682b11c25c95.tar.gz
gentoo-2-a1f343da8c2fbbb40c3a7248cebc682b11c25c95.tar.bz2
gentoo-2-a1f343da8c2fbbb40c3a7248cebc682b11c25c95.zip
Allow multiple space-separated APACHE*_MOD_DEFINEs to be set in ebuilds
Diffstat (limited to 'eclass/apache-module.eclass')
-rw-r--r--eclass/apache-module.eclass12
1 files changed, 8 insertions, 4 deletions
diff --git a/eclass/apache-module.eclass b/eclass/apache-module.eclass
index 754904d111e9..5cc5c01a2e98 100644
--- a/eclass/apache-module.eclass
+++ b/eclass/apache-module.eclass
@@ -1,7 +1,7 @@
# Copyright 2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
# Author Michael Tindal <urilith@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/apache-module.eclass,v 1.15 2006/06/10 16:19:54 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/apache-module.eclass,v 1.16 2006/10/12 13:41:10 tomk Exp $
inherit depend.apache
@@ -52,7 +52,7 @@ APACHE2_MOD_CONF=""
## APACHE1_MOD_DEFINE, APACHE2_MOD_DEFINE
##
## Name of define (eg FOO) to use in conditional loading of the installed
-## module/it's config file
+## module/it's config file, multiple defines should be space separated
####
APACHE1_MOD_DEFINE=""
APACHE2_MOD_DEFINE=""
@@ -208,9 +208,11 @@ apache1_pkg_postinst() {
debug-print-function apache1_pkg_postinst
if [ -n "${APACHE1_MOD_DEFINE}" ]; then
+ local my_opts="-D ${APACHE1_MOD_DEFINE// / -D }"
+
einfo
einfo "To enable ${PN}, you need to edit your /etc/conf.d/apache file and"
- einfo "add '-D ${APACHE1_MOD_DEFINE}' to APACHE_OPTS."
+ einfo "add '${my_opts}' to APACHE_OPTS."
einfo
fi
if [ -n "${APACHE1_MOD_CONF}" ] ; then
@@ -320,9 +322,11 @@ apache2_pkg_postinst() {
debug-print-function apache2_pkg_postinst
if [ -n "${APACHE2_MOD_DEFINE}" ]; then
+ local my_opts="-D ${APACHE2_MOD_DEFINE// / -D }"
+
einfo
einfo "To enable ${PN}, you need to edit your /etc/conf.d/apache2 file and"
- einfo "add '-D ${APACHE2_MOD_DEFINE}' to APACHE2_OPTS."
+ einfo "add '${my_opts}' to APACHE2_OPTS."
einfo
fi
if [ -n "${APACHE2_MOD_CONF}" ] ; then