diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2007-01-05 14:32:38 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2007-01-05 14:32:38 +0000 |
| commit | 5dc2faece0405207b8889bfcbfa2dfd2f9a20927 (patch) | |
| tree | 51ee3807b2b26ca5e9a40db7663f71e118a9a2e2 /rules/apache2.make | |
| parent | 46e1a3c2940e8e1c6513beb66720c992058e4da6 (diff) | |
| download | ptxdist-5dc2faece0405207b8889bfcbfa2dfd2f9a20927.tar.gz ptxdist-5dc2faece0405207b8889bfcbfa2dfd2f9a20927.tar.xz | |
* apache2.make
added missing PTXCONF to option ROOTFS_HTTPD_USER_DOC
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6740 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/apache2.make')
| -rw-r--r-- | rules/apache2.make | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/rules/apache2.make b/rules/apache2.make index cdfb2ed8e..03efee6d2 100644 --- a/rules/apache2.make +++ b/rules/apache2.make @@ -17,12 +17,12 @@ PACKAGES-$(PTXCONF_APACHE2) += apache2 # # Paths and names # -APACHE2_VERSION = 2.0.58 -APACHE2 = httpd-$(APACHE2_VERSION) -APACHE2_SUFFIX = tar.bz2 -APACHE2_URL = http://ftp.uni-erlangen.de/pub/mirrors/apache/httpd/$(APACHE2).$(APACHE2_SUFFIX) -APACHE2_SOURCE = $(SRCDIR)/$(APACHE2).$(APACHE2_SUFFIX) -APACHE2_DIR = $(BUILDDIR)/$(APACHE2) +APACHE2_VERSION := 2.0.58 +APACHE2 := httpd-$(APACHE2_VERSION) +APACHE2_SUFFIX := tar.bz2 +APACHE2_URL := http://ftp.uni-erlangen.de/pub/mirrors/apache/httpd/$(APACHE2).$(APACHE2_SUFFIX) +APACHE2_SOURCE := $(SRCDIR)/$(APACHE2).$(APACHE2_SUFFIX) +APACHE2_DIR := $(BUILDDIR)/$(APACHE2) # ---------------------------------------------------------------------------- @@ -70,7 +70,7 @@ APACHE2_ENV := $(CROSS_ENV) \ # # autoconf # -APACHE2_AUTOCONF = \ +APACHE2_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ --enable-so @@ -321,7 +321,7 @@ endif # # create apache's default serverroot # # # ifneq ($(PTXCONF_ROOTFS_HTTPD_SERVERROOT),"") -# ifdef ROOTFS_HTTPD_USER_DOC +# ifdef PTXCONF_ROOTFS_HTTPD_USER_DOC # @cd $(PTXCONF_ROOTFS_HTTPD_USER_DOC_PATH); \ # for i in *.html *.gif *.png; do \ # $(call install_copy, apache2, 12,102,0644,$$i,$(PTXCONF_ROOTFS_HTTPD_SERVERROOT)/docroot/$$i,n); \ |