summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom William Payne <twp@gentoo.org>2004-03-02 21:49:57 +0000
committerTom William Payne <twp@gentoo.org>2004-03-02 21:49:57 +0000
commit00cfb77df1cff07c03c5c1db905c79bcaa60a7a9 (patch)
tree0688d115ffca09c93b7beaec4813787cc8132ab5
parentAdded ~amd64 keyword. (Manifest recommit) (diff)
downloadgentoo-2-00cfb77df1cff07c03c5c1db905c79bcaa60a7a9.tar.gz
gentoo-2-00cfb77df1cff07c03c5c1db905c79bcaa60a7a9.tar.bz2
gentoo-2-00cfb77df1cff07c03c5c1db905c79bcaa60a7a9.zip
Ported webapp-detect change.
-rw-r--r--dev-db/phpmyadmin/phpmyadmin-2.5.6.ebuild6
1 files changed, 3 insertions, 3 deletions
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.5.6.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.5.6.ebuild
index 1e8d58dd8987..758d8fe6c3c9 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.5.6.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.5.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.5.6.ebuild,v 1.1 2004/03/01 19:04:11 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.5.6.ebuild,v 1.2 2004/03/02 21:49:57 twp Exp $
inherit eutils
inherit webapp-apache
@@ -19,9 +19,8 @@ DEPEND=">=net-www/apache-1.3
sys-apps/findutils"
S=${WORKDIR}/${MY_P}
-webapp-detect || NO_WEBSERVER=1
-
pkg_setup() {
+ webapp-detect || NO_WEBSERVER=1
webapp-pkg_setup "${NO_WEBSERVER}"
einfo "Installing into ${ROOT}${HTTPD_ROOT}."
}
@@ -42,6 +41,7 @@ src_compile() {
}
src_install() {
+ webapp-detect || NO_WEBSERVER=1
webapp-mkdirs
local DocumentRoot=${HTTPD_ROOT}