Make the apache build use file:// to locate the machine/distro specific httpd.conf...

BKrev: 41aebfefuPAmTnrHRG3iXtxY1AHkVw

diff --git a/apache/apache_2.0.48.oe b/apache/apache_2.0.48.oe
index fd98b22..b1f52b6 100644 (file)
--- a/apache/apache_2.0.48.oe
+++ b/apache/apache_2.0.48.oe
@@ -7,7 +7,8 @@ LICENSE="Apache-2.0"
 SRC_URI = "http://ftp.epix.net/apache/httpd/httpd-${PV}.tar.gz \
            file://configure.patch;patch=1 \
            file://pcre-configure.patch;patch=1 \
-           file://init"
+           file://init \
+          file://httpd.conf"
 S = "${WORKDIR}/httpd-${PV}"
 
 basesysconfdir := "${sysconfdir}"
@@ -68,9 +69,7 @@ do_install_append () {
                        s,/etc/,${basesysconfdir}/,g; \
                        s,/usr/,${prefix}/,g;' > ${D}/${basesysconfdir}/init.d/httpd
        chmod 755 ${D}/${basesysconfdir}/init.d/httpd
-       if test -e ${FILESDIR}/httpd.conf.${MACHINE}; then
-               install -m 0644 ${FILESDIR}/httpd.conf.${MACHINE} ${D}/${sysconfdir}/httpd.conf
-       fi
+       install -m 0644 ${WORKDIR}/httpd.conf ${D}/${sysconfdir}/httpd.conf
 }
 
 pkg_postinst () {