From 47ae92bca5dc99b984656ead4280da0e54a91468 Mon Sep 17 00:00:00 2001 From: Benedikt Boehm Date: Fri, 5 Mar 2010 09:01:07 +0000 Subject: do not install magic file unconditionally wrt #307747 --- eclass/apache-2.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'eclass/apache-2.eclass') diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass index 27de37f59e99..3e383c1a1f46 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.19 2009/10/04 15:00:45 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.20 2010/03/05 09:01:07 hollow Exp $ EAPI="2" @@ -486,7 +486,7 @@ apache-2_src_install() { generate_load_module insinto /etc/apache2 doins -r "${GENTOO_PATCHDIR}"/conf/* - doins docs/conf/magic + use apache2_modules_mime_magic && doins docs/conf/magic insinto /etc/logrotate.d newins "${GENTOO_PATCHDIR}"/scripts/apache2-logrotate apache2 -- cgit v1.2.3-65-gdbad