summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaleb Tennis <caleb@gentoo.org>2005-04-13 12:48:43 +0000
committerCaleb Tennis <caleb@gentoo.org>2005-04-13 12:48:43 +0000
commit2fd858c0e754b39c53a0057bb7fa7231713e7335 (patch)
tree117d3dcc46ef505ca836b5ac6f4369f7cec191a7 /dev-ruby/mod_ruby
parentVersion bump + small tidy up (diff)
downloadhistorical-2fd858c0e754b39c53a0057bb7fa7231713e7335.tar.gz
historical-2fd858c0e754b39c53a0057bb7fa7231713e7335.tar.bz2
historical-2fd858c0e754b39c53a0057bb7fa7231713e7335.zip
what i mean't to commit
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'dev-ruby/mod_ruby')
-rw-r--r--dev-ruby/mod_ruby/Manifest2
-rw-r--r--dev-ruby/mod_ruby/mod_ruby-1.2.4-r2.ebuild29
2 files changed, 18 insertions, 13 deletions
diff --git a/dev-ruby/mod_ruby/Manifest b/dev-ruby/mod_ruby/Manifest
index 486c069f77b9..41130578db46 100644
--- a/dev-ruby/mod_ruby/Manifest
+++ b/dev-ruby/mod_ruby/Manifest
@@ -1,6 +1,6 @@
MD5 ca3971be5992c98df25220e1a4e7782a mod_ruby-1.2.2.ebuild 1958
MD5 18a1d02fea28a3aafaac7e05f81d3152 mod_ruby-1.2.4.ebuild 1957
-MD5 a5f2f28c7117c3d8f0195323fee82c57 mod_ruby-1.2.4-r2.ebuild 1031
+MD5 92087ded863891825cc5ebff1dd1a567 mod_ruby-1.2.4-r2.ebuild 1160
MD5 0a3b2010518d678dcb74dacf8511fe28 mod_ruby-1.0.7.ebuild 927
MD5 2b4d5ae65d1dc92adf5c70292819be42 mod_ruby-1.2.4-r1.ebuild 1136
MD5 594bc7b5071758685ae0222908bdc4f8 ChangeLog 4260
diff --git a/dev-ruby/mod_ruby/mod_ruby-1.2.4-r2.ebuild b/dev-ruby/mod_ruby/mod_ruby-1.2.4-r2.ebuild
index 4b2fde1faef6..03ac0f9f5907 100644
--- a/dev-ruby/mod_ruby/mod_ruby-1.2.4-r2.ebuild
+++ b/dev-ruby/mod_ruby/mod_ruby-1.2.4-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod_ruby/mod_ruby-1.2.4-r2.ebuild,v 1.1 2005/04/13 12:44:21 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mod_ruby/mod_ruby-1.2.4-r2.ebuild,v 1.2 2005/04/13 12:48:43 caleb Exp $
inherit apache-module
@@ -19,27 +19,32 @@ APACHE1_MOD_CONF="mod_ruby"
APACHE2_MOD_CONF="21_mod_ruby"
APACHE1_MOD_DEFINE="RUBY"
APACHE2_MOD_DEFINE="RUBY"
-APACHE1_MOD_FILE="$S/mod_ruby.so"
-APACHE2_MOD_FILE="$S/mod_ruby.so"
+APACHE1_MOD_FILE="${PN}.so"
+APACHE2_MOD_FILE="${PN}.so"
DOCFILES="ChangeLog COPYING README.* doc/*.html doc/*.css"
need_apache
src_compile() {
- if [ "${APACHE_VERSION}" == "2" ]; then
- APXS=${APXS2}
- APACHE_BASEDIR=${APACHE2_BASEDIR}
- else
- APXS=${APXS1}
- APACHE_BASEDIR=${APACHE1_BASEDIR}
- fi
+ use apache2 || ./configure.rb --with-apxs=${APXS1}
+ use apache2 && ./configure.rb --with-apxs=${APXS2}
./configure.rb --with-apxs=${APXS}
- emake || die
+ emake || die "make failed"
if use doc; then
cd doc
- emake
+ emake || die "make failed"
fi
}
+
+src_install() {
+ emake DESTDIR=${D} install || die "make install failed"
+
+ if use doc; then
+ dohtml doc/*.css doc/*.html
+ fi
+
+ apache-module_src_install
+}