diff options
| author |   Benedikt Boehm <hollow@gentoo.org> | 2008-10-25 14:46:00 +0000 |
|---|---|---|
| committer | Benedikt Boehm <hollow@gentoo.org> | 2008-10-25 14:46:00 +0000 |
| commit | ebcc255585955dd001260b1d58bfe396dce8471d (patch) | |
| tree | e6cb94d9efff434e10779e155971a9d2d1144ab9 /eclass | |
| parent | Version bump. Fixes bug 240149. Drop old. (diff) | |
| download | gentoo-2-ebcc255585955dd001260b1d58bfe396dce8471d.tar.gz gentoo-2-ebcc255585955dd001260b1d58bfe396dce8471d.tar.bz2 gentoo-2-ebcc255585955dd001260b1d58bfe396dce8471d.zip | |
install apache2ctl wrapper script if available
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/apache-2.eclass | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass index 0a3874a96662..f9f02a5198a5 100644 --- a/eclass/apache-2.eclass +++ b/eclass/apache-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.12 2008/08/29 13:22:21 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.13 2008/10/25 14:46:00 hollow Exp $ # @ECLASS: apache-2.eclass # @MAINTAINER: @@ -478,8 +478,13 @@ apache-2_src_install() { newconfd "${GENTOO_PATCHDIR}"/init/apache2.confd apache2 newinitd "${GENTOO_PATCHDIR}"/init/apache2.initd apache2 - # link apache2ctl to the init script - dosym /etc/init.d/apache2 /usr/sbin/apache2ctl + # install apache2ctl wrapper for our init script if available + if test -e "${GENTOO_PATCHDIR}"/scripts/apache2ctl; then + exeinto /usr/sbin + doexe "${GENTOO_PATCHDIR}"/scripts/apache2ctl + else + dosym /etc/init.d/apache2 /usr/sbin/apache2ctl + fi # provide legacy symlink for apxs, bug 177697 dosym /usr/sbin/apxs /usr/sbin/apxs2 |