diff options
| author | Justin Patrin <papercrane@gmail.com> | 2005-08-22 20:50:44 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-22 20:50:44 +0000 |
| commit | 5099863a47319b3cb63dd56c98ce7829826834f1 (patch) | |
| tree | d21807472ee666cc04fc3f122e737166b3489380 /packages/apache | |
| parent | 15327f6dce227ddd18ac4a0da40ffe72e509df0d (diff) | |
| parent | d0ba354bb113dbbbe4794ec97138c374f24d4d40 (diff) | |
merge of 691f0a578002a1d669bfbee72d4a577ba19f5509
and c456324f80138ac3564996d0741d738f1fafa406
Diffstat (limited to 'packages/apache')
| -rw-r--r-- | packages/apache/apache_2.0.54.bb | 8 | ||||
| -rwxr-xr-x | packages/apache/files/init | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/packages/apache/apache_2.0.54.bb b/packages/apache/apache_2.0.54.bb index 882b7f2c71..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 = "r2" +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 diff --git a/packages/apache/files/init b/packages/apache/files/init index 46dae0395f..6c8ff0a6ec 100755 --- a/packages/apache/files/init +++ b/packages/apache/files/init @@ -64,7 +64,7 @@ case "$1" in ;; esac -if [ $? == 0 ]; then +if [ $? = 0 ]; then echo . exit 0 else |