diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-12-02 07:10:39 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-12-02 07:10:39 +0000 |
| commit | 73f0d9e7986cdc24467c9caf2c03c5353be9a18f (patch) | |
| tree | 7329582915c78eb9eabc87b002fe40e72551a958 | |
| parent | a5128d42db2317949b956d49cb5690b00bccb596 (diff) | |
Make the apache build use file:// to locate the machine/distro specific httpd.conf file (which thereby ensures that PACKAGE_ARCH is set correctly).
BKrev: 41aebfefuPAmTnrHRG3iXtxY1AHkVw
| -rw-r--r-- | apache/apache_2.0.48.oe | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/apache/apache_2.0.48.oe b/apache/apache_2.0.48.oe index fd98b222e0..b1f52b61a2 100644 --- 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 () { |