diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2005-08-22 15:05:58 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-22 15:05:58 +0000 |
| commit | 47632ce0ea60e766909f004d75e4cf7a266c62c6 (patch) | |
| tree | 48a6d23dce09e1cc819c00165f2fec4feee439c8 /packages/apache | |
| parent | 2dc09e524df860dc15c5a8b3093711c57d62f600 (diff) | |
| parent | b6fab8d87d9b8ff470fb0b99658d807e6afe4b56 (diff) | |
merge of 0bcaa551d84ba78a6e2e40137eb0e4ff36d0b68e
and 3c029d760d1bb441a3632db0b6ea12f2d8a5ad37
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 |