diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2006-07-24 21:02:43 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2006-07-24 21:02:43 +0000 |
| commit | 08bf6a0c0b1fd9a079e27b00819c19360ced34c3 (patch) | |
| tree | d19ef2e39594a4f96b3e733779910eb9b49d9a6d /rules/apache2.make | |
| parent | c952f2c6d3db45ab400f282f067f4df82740fa8b (diff) | |
| download | ptxdist-08bf6a0c0b1fd9a079e27b00819c19360ced34c3.tar.gz ptxdist-08bf6a0c0b1fd9a079e27b00819c19360ced34c3.tar.xz | |
* apache2.make:
- install apache2, fixup path in installed scripts
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@5947 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/apache2.make')
| -rw-r--r-- | rules/apache2.make | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/rules/apache2.make b/rules/apache2.make index 4fa83718e..5bf1f9f54 100644 --- a/rules/apache2.make +++ b/rules/apache2.make @@ -58,10 +58,9 @@ $(STATEDIR)/apache2.extract: $(apache2_extract_deps_default) apache2_prepare: $(STATEDIR)/apache2.prepare -APACHE2_PATH = PATH=$(CROSS_PATH) +APACHE2_PATH := PATH=$(CROSS_PATH) # FIXME: find a real patch for ac_* apr_* (fix configure script) -APACHE2_ENV = $(CROSS_ENV) \ - PKG_CONFIG_PATH=$(SYSROOT)/lib/pkgconfig \ +APACHE2_ENV := $(CROSS_ENV) \ ac_cv_sizeof_ssize_t=4 \ ac_cv_sizeof_size_t=4 \ apr_cv_process_shared_works=yes \ @@ -134,6 +133,14 @@ apache2_install: $(STATEDIR)/apache2.install $(STATEDIR)/apache2.install: $(apache2_install_deps_default) @$(call targetinfo, $@) + @$(call install, APACHE2) + sed -i -e "s~\([ =\"]\)\(/usr\)~\1$(SYSROOT)\2~g" \ + $(SYSROOT)/usr/build/apr_rules.mk \ + $(SYSROOT)/usr/build/config.nice \ + $(SYSROOT)/usr/build/config_vars.mk \ + $(SYSROOT)/usr/bin/apr-config \ + $(SYSROOT)/usr/bin/apu-config \ + $(SYSROOT)/usr/bin/apxs @$(call touch, $@) # ---------------------------------------------------------------------------- |