diff options
| author | Cliff Brake <cbrake@bec-systems.com> | 2009-02-24 09:36:26 -0500 |
|---|---|---|
| committer | Cliff Brake <cbrake@bec-systems.com> | 2009-02-24 09:36:26 -0500 |
| commit | cdbe198009d0b73bca24ae7aada4401ae2f0b630 (patch) | |
| tree | 5325d3a2d3790616b37a37d3ec063d4a5163573c /packages/apache2/apache2-native_2.2.3.bb | |
| parent | ab066eb3b73656186a445667aa4f8c46b48644b3 (diff) | |
| parent | d4ed85c5499e8eb693b7564e60d7038598659e51 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'packages/apache2/apache2-native_2.2.3.bb')
| -rw-r--r-- | packages/apache2/apache2-native_2.2.3.bb | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/packages/apache2/apache2-native_2.2.3.bb b/packages/apache2/apache2-native_2.2.3.bb index 73f9b8baec..3ea987c718 100644 --- a/packages/apache2/apache2-native_2.2.3.bb +++ b/packages/apache2/apache2-native_2.2.3.bb @@ -3,7 +3,7 @@ DEPENDS = "expat pcre" inherit native -PR ="r9" +PR ="r10" SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2" S = "${WORKDIR}/httpd-${PV}" @@ -20,25 +20,20 @@ do_stage () { cp srclib/apr-util/apu-1-config ${STAGING_BINDIR_NATIVE} cp support/apxs ${STAGING_BINDIR_NATIVE} chmod 755 ${STAGING_BINDIR_NATIVE}/apxs - mkdir -p ${STAGING_DIR}/build - cp build/*.mk ${STAGING_DIR}/build - cat build/config_vars.mk | \ - sed -e '/^prefix/s,staging,staging/${HOST_SYS},' | \ - sed -e '/^includedir/s,/include,/include/apache2,' | \ - sed -e 's,staging/bin,staging/${HOST_SYS}/bin,' > \ - ${STAGING_DIR}/build/config_vars.mk - cp build/instdso.sh ${STAGING_DIR}/build + mkdir -p ${STAGING_DIR_NATIVE}//usr/build + cp build/*.mk ${STAGING_DIR_NATIVE}/usr/build + cp build/instdso.sh ${STAGING_DIR_NATIVE}/usr/build cp .libs/httpd ${STAGING_BINDIR_NATIVE} (cd srclib/apr/.libs; tar -cf - libapr-*.so* ) | - (cd ${STAGING_LIBDIR}; tar -xf - ) + (cd ${STAGING_LIBDIR_NATIVE}; tar -xf - ) (cd srclib/apr-util/.libs; tar -cf - libaprutil-*.so* ) | - (cd ${STAGING_LIBDIR}; tar -xf - ) + (cd ${STAGING_LIBDIR_NATIVE}; tar -xf - ) - mkdir -p ${STAGING_INCDIR}/apache2 - cp include/* ${STAGING_INCDIR}/apache2 - cp os/unix/os.h ${STAGING_INCDIR}/apache2 - cp os/unix/unixd.h ${STAGING_INCDIR}/apache2 + mkdir -p ${STAGING_INCDIR_NATIVE}/apache2 + cp include/* ${STAGING_INCDIR_NATIVE}/apache2 + cp os/unix/os.h ${STAGING_INCDIR_NATIVE}/apache2 + cp os/unix/unixd.h ${STAGING_INCDIR_NATIVE}/apache2 cp support/envvars-std ${STAGING_BINDIR_NATIVE}/envvars chmod 755 ${STAGING_BINDIR_NATIVE}/envvars |