diff options
| author |   Tom William Payne <twp@gentoo.org> | 2003-05-10 11:29:59 +0000 |
|---|---|---|
| committer | Tom William Payne <twp@gentoo.org> | 2003-05-10 11:29:59 +0000 |
| commit | 775538c8f077073c23c61f5962b689cc9385a39b (patch) | |
| tree | b80dbabff9dfbf53f29b4ca85a0b9da50edef9e4 /dev-db | |
| parent | Always install into /home/httpd/htdocs (diff) | |
| download | gentoo-2-775538c8f077073c23c61f5962b689cc9385a39b.tar.gz gentoo-2-775538c8f077073c23c61f5962b689cc9385a39b.tar.bz2 gentoo-2-775538c8f077073c23c61f5962b689cc9385a39b.zip | |
Always install into /home/httpd/htdocs
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/phpmyadmin/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/phpmyadmin/Manifest | 4 | ||||
| -rw-r--r-- | dev-db/phpmyadmin/phpmyadmin-2.4.0.ebuild | 32 |
3 files changed, 17 insertions, 25 deletions
diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog index 6d82448c688f..e14d68bb6c6e 100644 --- a/dev-db/phpmyadmin/ChangeLog +++ b/dev-db/phpmyadmin/ChangeLog @@ -1,9 +1,13 @@ # ChangeLog for dev-db/phpmyadmin # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.18 2003/05/09 11:15:40 twp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.19 2003/05/10 11:29:31 twp Exp $ *phpmyadmin-2.4.0 (08 Apr 2003) + 10 May 2003; Tom Payne <twp@gentoo.org> phpmyadmin-2.4.0.ebuild : + + Always install to /home/httpd/htdocs. Bug # 20642. + 09 May 2003; Tom Payne <twp@gentoo.org> phpmyadmin-2.4.0.ebuild : Allow user to override document root with DOCUMENT_ROOT env var. Bug # 20642. diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest index f893b5da7e4d..0a390f44a4d2 100644 --- a/dev-db/phpmyadmin/Manifest +++ b/dev-db/phpmyadmin/Manifest @@ -1,7 +1,7 @@ -MD5 3800dd2eaa0e3ffd8dd961f09afe6c1a ChangeLog 3784 +MD5 c823b96db72ef6734f370dffe77bdb8a ChangeLog 3784 MD5 50116d5aa339dbdbfdec14a907416b36 phpmyadmin-2.3.2-r1.ebuild 1608 MD5 d89ed894f4f2efad6e88ddcc1bbe4944 phpmyadmin-2.3.3.ebuild 2186 -MD5 85a3cfd527708594790403c125d8b584 phpmyadmin-2.4.0.ebuild 2241 +MD5 b4631be7b7dc1502c754606c64e43acd phpmyadmin-2.4.0.ebuild 2241 MD5 0ee9b66e7a73593103df05d91d31dc8d files/digest-phpmyadmin-2.3.2-r1 73 MD5 fedff25cf01133c5bb8efd8d7f9da56e files/digest-phpmyadmin-2.3.3 76 MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857 diff --git a/dev-db/phpmyadmin/phpmyadmin-2.4.0.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.4.0.ebuild index 3155b4c92267..58b25b3985c6 100644 --- a/dev-db/phpmyadmin/phpmyadmin-2.4.0.ebuild +++ b/dev-db/phpmyadmin/phpmyadmin-2.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.4.0.ebuild,v 1.4 2003/05/09 11:15:40 twp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.4.0.ebuild,v 1.5 2003/05/10 11:29:31 twp Exp $ inherit eutils @@ -32,36 +32,24 @@ src_compile() { src_install () { - # Attempt to guess DocumentRoot (bug # 20642) - # 1. Use DOCUMENT_ROOT env var if set - # 2. Grep apache.conf/apache2.conf as appropriate - # 3. Fallback on /home/httpd/htdocs - if [ -z "${DOCUMENT_ROOT}" ]; then - if [ "`use apache2`" ]; then - DOCUMENT_ROOT="`grep '^DocumentRoot' /etc/apache2/conf/apache2.conf | cut -d\ -f2`" - else - DOCUMENT_ROOT="`grep '^DocumentRoot' /etc/apache/conf/apache.conf | cut -d\ -f2`" - fi - fi - einfo "DOCUMENT_ROOT=${DOCUMENT_ROOT}" - [ -z "${DOCUMENT_ROOT}" ] && DOCUMENT_ROOT="/home/httpd/htdocs" - - insinto ${DOCUMENT_ROOT}/phpmyadmin + local DocumentRoot="/home/httpd/htdocs" + + insinto ${DocumentRoot}/phpmyadmin doins *.{php,html} ChangeLog - insinto ${DOCUMENT_ROOT}/phpmyadmin/images + insinto ${DocumentRoot}/phpmyadmin/images doins images/*.{gif,png} - insinto ${DOCUMENT_ROOT}/phpmyadmin/scripts + insinto ${DocumentRoot}/phpmyadmin/scripts doins scripts/*.sh - insinto ${DOCUMENT_ROOT}/phpmyadmin/lang + insinto ${DocumentRoot}/phpmyadmin/lang doins lang/*.{php,sh} - insinto ${DOCUMENT_ROOT}/phpmyadmin/libraries + insinto ${DocumentRoot}/phpmyadmin/libraries doins libraries/*.{php,js} - insinto ${DOCUMENT_ROOT}/phpmyadmin/libraries/auth + insinto ${DocumentRoot}/phpmyadmin/libraries/auth doins libraries/auth/*.php dodoc ANNOUNCE.txt CREDITS ChangeLog TODO Documentation.{txt,html} \ @@ -70,7 +58,7 @@ src_install () { insinto /etc/phpmyadmin doins config.inc.php mysql-setup.sql - dosym /etc/phpmyadmin/config.inc.php ${DOCUMENT_ROOT}/phpmyadmin/config.inc.php + dosym /etc/phpmyadmin/config.inc.php ${DocumentRoot}/phpmyadmin/config.inc.php } |