diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2012-05-03 21:23:19 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2012-05-08 16:20:40 +0200 |
| commit | adb250148d979c2dd58b41ff8151f9c577b76572 (patch) | |
| tree | 553ae821e6b3e4f959cf0db92577522ab949c2a6 /rules/host-apache2.make | |
| parent | 3a1295b8d32eedee969e76778303b37e73228ea8 (diff) | |
| download | ptxdist-adb250148d979c2dd58b41ff8151f9c577b76572.tar.gz ptxdist-adb250148d979c2dd58b41ff8151f9c577b76572.tar.xz | |
apache2: update to 2.0.64 + use external apr + apr-util
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'rules/host-apache2.make')
| -rw-r--r-- | rules/host-apache2.make | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/rules/host-apache2.make b/rules/host-apache2.make index a58662d68..a9b39d0f6 100644 --- a/rules/host-apache2.make +++ b/rules/host-apache2.make @@ -1,8 +1,8 @@ # -*-makefile-*- # # Copyright (C) 2005 by Robert Schwebel -# 2009 by Marc Kleine-Budde <mkl@pengutronix.de> -# +# 2009, 2012 by Marc Kleine-Budde <mkl@pengutronix.de> +# # See CREDITS for details about who has contributed to this project. # # For further information about the PTXdist project and license conditions @@ -14,22 +14,15 @@ # HOST_PACKAGES-$(PTXCONF_HOST_APACHE2) += host-apache2 -# -# Paths and names -# -HOST_APACHE2 = $(APACHE2) -HOST_APACHE2_DIR = $(HOST_BUILDDIR)/$(HOST_APACHE2) - # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -HOST_APACHE2_ENV := $(HOST_ENV) - -# -# autoconf -# -HOST_APACHE2_AUTOCONF := --prefix=/ +HOST_APACHE2_CONF_TOOL := autoconf +HOST_APACHE2_CONF_OPT := \ + --prefix=/ \ + --with-apr=$(PTXDIST_SYSROOT_HOST)/bin/apr-config \ + --with-apr-util=$(PTXDIST_SYSROOT_HOST)/bin/apu-config # ---------------------------------------------------------------------------- # Compile @@ -37,9 +30,8 @@ HOST_APACHE2_AUTOCONF := --prefix=/ $(STATEDIR)/host-apache2.compile: @$(call targetinfo) - cd $(HOST_APACHE2_DIR)/srclib/apr-util/uri && $(HOST_APACHE2_ENV) $(MAKE) - cd $(HOST_APACHE2_DIR)/srclib/pcre && $(HOST_APACHE2_ENV) $(MAKE) dftables - cd $(HOST_APACHE2_DIR)/server && $(HOST_APACHE2_ENV) $(MAKE) gen_test_char + @make -C $(HOST_APACHE2_DIR)/server gen_test_char + @make -C $(HOST_APACHE2_DIR)/srclib/pcre dftables @$(call touch) # ---------------------------------------------------------------------------- @@ -48,12 +40,10 @@ $(STATEDIR)/host-apache2.compile: $(STATEDIR)/host-apache2.install: @$(call targetinfo) - install -D -m 755 "$(HOST_APACHE2_DIR)/srclib/apr-util/uri/gen_uri_delims" \ - "$(HOST_APACHE2_PKGDIR)/bin/apache2/gen_uri_delims" - install -D -m 755 "$(HOST_APACHE2_DIR)/srclib/pcre/dftables" \ - "$(HOST_APACHE2_PKGDIR)/bin/apache2/dftables" - install -D -m 755 "$(HOST_APACHE2_DIR)/server/gen_test_char" \ - "$(HOST_APACHE2_PKGDIR)/bin/apache2/gen_test_char" + @install -D -m 755 ${HOST_APACHE2_DIR}/server/gen_test_char \ + ${HOST_APACHE2_PKGDIR}/bin/gen_test_char + @install -D -m 755 ${HOST_APACHE2_DIR}/srclib/pcre/dftables \ + ${HOST_APACHE2_PKGDIR}/bin/dftables @$(call touch) # vim: syntax=make |