replaced hardcoding of apache path

3 files changed, 23 insertions, 14 deletions

diff --git a/app-doc/gentoo-web/ChangeLog b/app-doc/gentoo-web/ChangeLog
index 327127539af9..7ec8ef41a793 100644
--- a/app-doc/gentoo-web/ChangeLog
+++ b/app-doc/gentoo-web/ChangeLog
@@ -1,21 +1,26 @@
 # ChangeLog for app-doc/gentoo-web
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-doc/gentoo-web/ChangeLog,v 1.2 2002/11/06 03:46:39 zhen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/gentoo-web/ChangeLog,v 1.3 2002/11/14 18:41:09 vapier Exp $
+
+*gentoo-web-2.4 (4 Nov 2002)
+
+  14 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
+  Replaced hardcoding of /home/httpd/htdocs with a grep of /etc/apache/conf/apache.conf
+
+  1 Nov 2002; John P. Davis <zhen@gentoo.org> ChangeLog :
+  I added a for loop that makes a text copy of every doc in doc/
+  using lynx -dump.
+  
+*gentoo-web-2.3a (14 Nov 2002)
+
+  14 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
+  Replaced hardcoding of /home/httpd/htdocs with a grep of /etc/apache/conf/apache.conf
 
 *gentoo-web-2.2 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
   writing correct changelogs are explained in the skel.ChangeLog file which you
   can find in the root directory of the portage repository.
-
-*gentoo-web-2.4 (4 Nov 2002)
-
-	1 Nov 2002; John P. Davis <zhen@gentoo.org> ChangeLog :
-	
-	I added a for loop that makes a text copy of every doc in doc/
-	using lynx -dump.
-  
diff --git a/app-doc/gentoo-web/gentoo-web-2.3a.ebuild b/app-doc/gentoo-web/gentoo-web-2.3a.ebuild
index 1798fbbba44b..49b18f5a67b6 100644
--- a/app-doc/gentoo-web/gentoo-web-2.3a.ebuild
+++ b/app-doc/gentoo-web/gentoo-web-2.3a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/gentoo-web/gentoo-web-2.3a.ebuild,v 1.14 2002/10/04 20:31:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/gentoo-web/gentoo-web-2.3a.ebuild,v 1.15 2002/11/14 18:36:53 vapier Exp $
  
 S=${WORKDIR}/gentoo-src/gentoo-web
 TEMPLATE=${S}/xsl/guide-main.xsl
@@ -40,8 +40,10 @@ src_unpack() {
 			# assign it from the environment.
 			WEBROOT=${WEBROOT}
 		else
+			# look for it with apache
+			WEBROOT="`grep '^DocumentRoot' /etc/apache/conf/apache.conf | cut -d\  -f2`"
 			# give it a nice default
-			WEBROOT=/home/httpd/htdocs
+			[ -z "${WEBROOT}" ] && WEBROOT=/home/httpd/htdocs
 		fi
 	fi
 
diff --git a/app-doc/gentoo-web/gentoo-web-2.4.ebuild b/app-doc/gentoo-web/gentoo-web-2.4.ebuild
index 47ea218b0cbb..d9005deee69a 100644
--- a/app-doc/gentoo-web/gentoo-web-2.4.ebuild
+++ b/app-doc/gentoo-web/gentoo-web-2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/gentoo-web/gentoo-web-2.4.ebuild,v 1.15 2002/11/08 18:49:00 zhen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/gentoo-web/gentoo-web-2.4.ebuild,v 1.16 2002/11/14 18:36:53 vapier Exp $
  
 S=${WORKDIR}/gentoo-src/gentoo-web
 TEMPLATE=${S}/xsl/guide-main.xsl
@@ -42,8 +42,10 @@ src_unpack() {
 			# assign it from the environment.
 			WEBROOT=${WEBROOT}
 		else
+			# look for it with apache
+			WEBROOT="`grep '^DocumentRoot' /etc/apache/conf/apache.conf | cut -d\  -f2`"
 			# give it a nice default
-			WEBROOT=/home/httpd/htdocs
+			[ -z "${WEBROOT}" ] && WEBROOT=/home/httpd/htdocs
 			#GENTOO_SRCDIR=/data/gentoo-src
 		fi
 	fi