summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/apache/apache_2.0.54.bb8
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/apache/apache_2.0.54.bb b/packages/apache/apache_2.0.54.bb
index 37138bb87c..3ab58c590f 100644
--- a/packages/apache/apache_2.0.54.bb
+++ b/packages/apache/apache_2.0.54.bb
@@ -2,7 +2,7 @@ MAINTAINER="David Karlstrom <daka@nslu2-linux.org>"
SECTION = "net"
DEPENDS = "openssl expat pcre"
-PR = "r3"
+PR = "r4"
# ------------------------------------------
# NOTE: This package is currently only meant
@@ -16,7 +16,7 @@ S = "${WORKDIR}/httpd-${PV}"
inherit autotools update-rc.d
-INITSCRIPT_NAME = "httpd"
+INITSCRIPT_NAME = "apache"
INITSCRIPT_PARAMS = "defaults 91 20"
CONFFILES_${PN} = "${sysconfdir}/apache/httpd.conf \
@@ -74,8 +74,8 @@ do_install_append () {
-e 's,/usr/bin/,${bindir}/,g' \
-e 's,/usr/lib,${libdir}/,g' \
-e 's,/etc/,${sysconfdir}/,g' \
- -e 's,/usr/,${prefix}/,g' > ${D}/${sysconfdir}/init.d/httpd
- chmod 755 ${D}/${sysconfdir}/init.d/httpd
+ -e 's,/usr/,${prefix}/,g' > ${D}/${sysconfdir}/init.d/apache
+ chmod 755 ${D}/${sysconfdir}/init.d/apache
install -m 0644 ${FILESDIR}/httpd.conf ${D}/${sysconfdir}/apache/httpd.conf