diff options
| author |   Matti Bickel <mabi@gentoo.org> | 2010-10-24 12:17:01 +0000 |
|---|---|---|
| committer | Matti Bickel <mabi@gentoo.org> | 2010-10-24 12:17:01 +0000 |
| commit | 91f0eea618987a395e03487394cfb27d38dc2a0a (patch) | |
| tree | e1eea2fcbba8f5840b282c689ad528aa80c893fc /dev-lang | |
| parent | Fix compilation on Darwin, fixes bug #342373, adds back necessary bits for bu... (diff) | |
| download | gentoo-2-91f0eea618987a395e03487394cfb27d38dc2a0a.tar.gz gentoo-2-91f0eea618987a395e03487394cfb27d38dc2a0a.tar.bz2 gentoo-2-91f0eea618987a395e03487394cfb27d38dc2a0a.zip | |
install apache module config file into standard directory
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/php/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/php/files/eblits/src_install-v2.eblit | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog index 55d2fd1a99bb..9621fc22b55f 100644 --- a/dev-lang/php/ChangeLog +++ b/dev-lang/php/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/php # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.426 2010/10/24 11:48:42 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.427 2010/10/24 12:17:01 mabi Exp $ + + 24 Oct 2010; Matti Bickel <mabi@gentoo.org> + files/eblits/src_install-v2.eblit: + install apache module config file into standard directory 24 Oct 2010; Matti Bickel <mabi@gentoo.org> files/eblits/src_configure-v1.eblit, files/eblits/src_configure-v2.eblit: diff --git a/dev-lang/php/files/eblits/src_install-v2.eblit b/dev-lang/php/files/eblits/src_install-v2.eblit index 63e8808bdaa5..add1fdeef9a6 100644 --- a/dev-lang/php/files/eblits/src_install-v2.eblit +++ b/dev-lang/php/files/eblits/src_install-v2.eblit @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit,v 1.5 2010/10/19 20:07:25 olemarkus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v2.eblit,v 1.6 2010/10/24 12:17:01 mabi Exp $ eblit-php-src_install() { # see bug #324739 for what happens when we don't have that @@ -130,8 +130,7 @@ php_install_ini() { # SAPI-specific handling if [[ "${sapi}" == "apache2" ]] ; then - einfo "Installing Apache2 config 70_mod_php${PHP_MV}.conf (${PHP_DESTDIR})" - insinto ${PHP_DESTDIR}/apache2 + insinto "${APACHE_MODULES_CONFDIR}" newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \ "70_mod_php${PHP_MV}.conf" fi |