summaryrefslogtreecommitdiff
path: root/apache
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-05-22 16:47:36 +0000
committerChris Larson <clarson@kergoth.com>2004-05-22 16:47:36 +0000
commit2b8f679ffe5929b5a11eb71e514aa4997c36f13e (patch)
treecab0f25aca03f6162bd268a401945fbfbb63bff9 /apache
parent5df179157f90b18f437c6978efb451f515e3d1c9 (diff)
Merges.
2004/05/22 12:46:48-04:00 local!kergoth Bugfixes per the recent FILESDIR cleanup. 2004/05/22 01:03:38-04:00 local!kergoth Run a perl script against the repo to kill off direct FILESDIR usage in favor of relative file:// paths in SRC_URI, and WORKDIR references in functions. 2004/05/21 23:07:58-04:00 local!kergoth Switch file:// FILESDIR uris in SRC_URI to the new relative path format. BKrev: 40af8428aNyDLBX0MRtyso3VCpMv1w
Diffstat (limited to 'apache')
-rw-r--r--apache/apache_2.0.48.oe9
1 files changed, 5 insertions, 4 deletions
diff --git a/apache/apache_2.0.48.oe b/apache/apache_2.0.48.oe
index dd5db4fda9..b47baa14fa 100644
--- a/apache/apache_2.0.48.oe
+++ b/apache/apache_2.0.48.oe
@@ -3,14 +3,15 @@ DEPENDS = "virtual/libc expat openssl"
DESCRIPTION = "A high performance Unix-based HTTP server."
SRC_URI = "http://ftp.epix.net/apache/httpd/httpd-${PV}.tar.gz \
- file://${FILESDIR}/configure.patch;patch=1 \
- file://${FILESDIR}/pcre-configure.patch;patch=1"
+ file://configure.patch;patch=1 \
+ file://pcre-configure.patch;patch=1 \
+ file://init"
S = "${WORKDIR}/httpd-${PV}"
basesysconfdir := "${sysconfdir}"
sysconfdir = "/etc/apache"
-inherit autotools
+inherit autotools
FILES_${PN}="${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
${libdir}/*/ ${basesysconfdir} ${sharedstatedir} ${localstatedir} \
@@ -57,7 +58,7 @@ do_compile () {
do_install_append () {
set -x
install -d ${D}/${basesysconfdir}/init.d
- cat ${FILESDIR}/init | \
+ cat ${WORKDIR}/init | \
sed -e 's,/usr/sbin/,${sbindir}/,g; \
s,/usr/bin/,${bindir}/,g; \
s,/usr/lib,${libdir}/,g; \