| 1 |
hollow 08/02/02 12:31:00 |
| 2 |
|
| 3 |
Modified: apache-module.eclass |
| 4 |
Log: |
| 5 |
fix depend.apache usage wrt #208033 |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.22 eclass/apache-module.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/apache-module.eclass?rev=1.22&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/apache-module.eclass?rev=1.22&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/apache-module.eclass?r1=1.21&r2=1.22 |
| 13 |
|
| 14 |
Index: apache-module.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/apache-module.eclass,v |
| 17 |
retrieving revision 1.21 |
| 18 |
retrieving revision 1.22 |
| 19 |
diff -u -r1.21 -r1.22 |
| 20 |
--- apache-module.eclass 27 Jan 2008 20:09:17 -0000 1.21 |
| 21 |
+++ apache-module.eclass 2 Feb 2008 12:31:00 -0000 1.22 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2007 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/apache-module.eclass,v 1.21 2008/01/27 20:09:17 hollow Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/apache-module.eclass,v 1.22 2008/02/02 12:31:00 hollow Exp $ |
| 27 |
|
| 28 |
# @ECLASS: apache-module |
| 29 |
# @MAINTAINER: apache-devs@g.o |
| 30 |
@@ -31,27 +31,27 @@ |
| 31 |
# Arguments to pass to the apxs tool |
| 32 |
APXS2_ARGS="" |
| 33 |
|
| 34 |
-# @ECLASS-VARIABLE: APACHE2_MOD_FILE |
| 35 |
-# @DESCRIPTION: |
| 36 |
-# Name of the module that src_install installs (minus the .so) |
| 37 |
-APACHE2_MOD_FILE="" |
| 38 |
- |
| 39 |
# @ECLASS-VARIABLE: APACHE2_MOD_CONF |
| 40 |
# @DESCRIPTION: |
| 41 |
# Configuration file installed by src_install |
| 42 |
APACHE2_MOD_CONF="" |
| 43 |
|
| 44 |
-# @ECLASS-VARIABLE: APACHE2_VHOSTFILE |
| 45 |
-# @DESCRIPTION: |
| 46 |
-# Virtual host configuration file installed by src_install |
| 47 |
-APACHE2_VHOSTFILE="" |
| 48 |
- |
| 49 |
# @ECLASS-VARIABLE: APACHE2_MOD_DEFINE |
| 50 |
# @DESCRIPTION: |
| 51 |
# Name of define (eg FOO) to use in conditional loading of the installed |
| 52 |
# module/it's config file, multiple defines should be space separated |
| 53 |
APACHE2_MOD_DEFINE="" |
| 54 |
|
| 55 |
+# @ECLASS-VARIABLE: APACHE2_MOD_FILE |
| 56 |
+# @DESCRIPTION: |
| 57 |
+# Name of the module that src_install installs (minus the .so) |
| 58 |
+APACHE2_MOD_FILE="" |
| 59 |
+ |
| 60 |
+# @ECLASS-VARIABLE: APACHE2_VHOST_CONF |
| 61 |
+# @DESCRIPTION: |
| 62 |
+# Virtual host configuration file installed by src_install |
| 63 |
+APACHE2_VHOST_CONF="" |
| 64 |
+ |
| 65 |
# @ECLASS-VARIABLE: DOCFILES |
| 66 |
# @DESCRIPTION: |
| 67 |
# If the exported src_install() is being used, and ${DOCFILES} is non-zero, some |
| 68 |
@@ -143,8 +143,8 @@ |
| 69 |
|
| 70 |
# @FUNCTION: apache-module_src_compile |
| 71 |
# @DESCRIPTION: |
| 72 |
-# The default action is to call ${APXS2} with the value of ${APXS2_ARGS}. If a |
| 73 |
-# module requires a different build setup than this, use ${APXS2} in your own |
| 74 |
+# The default action is to call ${APXS} with the value of ${APXS2_ARGS}. If a |
| 75 |
+# module requires a different build setup than this, use ${APXS} in your own |
| 76 |
# src_compile routine. |
| 77 |
apache-module_src_compile() { |
| 78 |
debug-print-function $FUNCNAME $* |
| 79 |
@@ -152,7 +152,7 @@ |
| 80 |
CD_DIR=$(apache_cd_dir) |
| 81 |
cd "${CD_DIR}" || die "cd ${CD_DIR} failed" |
| 82 |
APXS2_ARGS="${APXS2_ARGS:--c ${PN}.c}" |
| 83 |
- ${APXS2} ${APXS2_ARGS} || die "${APXS2} ${APXS2_ARGS} failed" |
| 84 |
+ ${APXS} ${APXS2_ARGS} || die "${APXS} ${APXS2_ARGS} failed" |
| 85 |
} |
| 86 |
|
| 87 |
# @FUNCTION: apache-module_src_install |
| 88 |
@@ -172,20 +172,20 @@ |
| 89 |
|
| 90 |
MOD_FILE=$(apache_mod_file) |
| 91 |
|
| 92 |
- exeinto "${APACHE2_MODULESDIR}" |
| 93 |
+ exeinto "${APACHE_MODULESDIR}" |
| 94 |
doexe ${MOD_FILE} || die "internal ebuild error: '${MOD_FILE}' not found" |
| 95 |
[[ -n "${APACHE2_EXECFILES}" ]] && doexe ${APACHE2_EXECFILES} |
| 96 |
|
| 97 |
if [[ -n "${APACHE2_MOD_CONF}" ]] ; then |
| 98 |
- insinto "${APACHE2_MODULES_CONFDIR}" |
| 99 |
+ insinto "${APACHE_MODULES_CONFDIR}" |
| 100 |
set -- ${APACHE2_MOD_CONF} |
| 101 |
newins "${FILESDIR}/${1}.conf" "$(basename ${2:-$1}).conf" \ |
| 102 |
|| die "internal ebuild error: '${FILESDIR}/${1}.conf' not found" |
| 103 |
fi |
| 104 |
|
| 105 |
- if [[ -n "${APACHE2_VHOSTFILE}" ]] ; then |
| 106 |
- insinto "${APACHE2_VHOSTDIR}" |
| 107 |
- set -- ${APACHE2_VHOSTFILE} |
| 108 |
+ if [[ -n "${APACHE2_VHOST_CONF}" ]] ; then |
| 109 |
+ insinto "${APACHE_VHOSTS_CONFDIR}" |
| 110 |
+ set -- ${APACHE2_VHOST_CONF} |
| 111 |
newins "${FILESDIR}/${1}.conf" "$(basename ${2:-$1}).conf " \ |
| 112 |
|| die "internal ebuild error: '${FILESDIR}/${1}.conf' not found" |
| 113 |
fi |
| 114 |
@@ -220,7 +220,7 @@ |
| 115 |
set -- ${APACHE2_MOD_CONF} |
| 116 |
einfo |
| 117 |
einfo "Configuration file installed as" |
| 118 |
- einfo " ${APACHE2_MODULES_CONFDIR}/$(basename $1).conf" |
| 119 |
+ einfo " ${APACHE_MODULES_CONFDIR}/$(basename $1).conf" |
| 120 |
einfo "You may want to edit it before turning the module on in /etc/conf.d/apache2" |
| 121 |
einfo |
| 122 |
fi |
| 123 |
|
| 124 |
|
| 125 |
|
| 126 |
-- |
| 127 |
gentoo-commits@l.g.o mailing list |
Archives