diff options
| author | Ladislav Michl <ladis@linux-mips.org> | 2006-10-02 08:42:29 +0000 |
|---|---|---|
| committer | Ladislav Michl <ladis@linux-mips.org> | 2006-10-02 08:42:29 +0000 |
| commit | 7c3c41eeb72962bc5602ca1bf56959a66c0eae19 (patch) | |
| tree | ae64663fa778da94e24618069544014d4080e05d /rules/apache2.make | |
| parent | 568af4a0f01ce4277782dc1fa75787b5f2220e6d (diff) | |
| download | ptxdist-7c3c41eeb72962bc5602ca1bf56959a66c0eae19.tar.gz ptxdist-7c3c41eeb72962bc5602ca1bf56959a66c0eae19.tar.xz | |
Add possibility to install custom error messages from apache2 distribution.
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6090 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/apache2.make')
| -rw-r--r-- | rules/apache2.make | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/rules/apache2.make b/rules/apache2.make index b6abe4c84..cbdb934d1 100644 --- a/rules/apache2.make +++ b/rules/apache2.make @@ -1,5 +1,5 @@ # -*-makefile-*- -# $Id: apache2.make,v 1.9 2006/09/26 20:45:08 michl Exp $ +# $Id: apache2.make,v 1.10 2006/10/02 08:38:47 michl Exp $ # # Copyright (C) 2005 by Robert Schwebel # @@ -192,8 +192,8 @@ $(STATEDIR)/apache2.targetinstall: $(apache2_targetinstall_deps_default) ifneq ($(PTXCONF_APACHE2_SERVERROOT),"") @$(call install_copy, apache2, 12,102,0755,$(PTXCONF_APACHE2_SERVERROOT)) - # TODO: are the icons needed? (or are all icons required?) - +ifdef PTXCONF_APACHE2_PUBLICDOMAINICONS + # TODO: are all icons required? @$(call install_copy, apache2, 12,102,0755,$(PTXCONF_APACHE2_SERVERROOT)/icons) @cd $(APACHE2_DIR)/docs/icons; \ for i in *.gif *.png; do \ @@ -204,6 +204,20 @@ ifneq ($(PTXCONF_APACHE2_SERVERROOT),"") for i in *.gif *.png; do \ $(call install_copy, apache2, 12,102,0644,$$i,$(PTXCONF_APACHE2_SERVERROOT)/icons/small/$$i,n); \ done +endif +ifdef PTXCONF_APACHE2_CUSTOMERRORS + @$(call install_copy, apache2, 12,102,0755,$(PTXCONF_APACHE2_SERVERROOT)/error) + @cd $(APACHE2_DIR)/docs/error; \ + for i in *.html.var; do \ + $(call install_copy, apache2, 12,102,0644,$$i,$(PTXCONF_APACHE2_SERVERROOT)/error/$$i,n); \ + done + @$(call install_copy, apache2, 12,102,0755,$(PTXCONF_APACHE2_SERVERROOT)/error/include) + @cd $(APACHE2_DIR)/docs/error/include; \ + for i in *.html; do \ + $(call install_copy, apache2, 12,102,0644,$$i,$(PTXCONF_APACHE2_SERVERROOT)/error/include/$$i,n); \ + done +endif + # # install some generic definitions into the directory where # the server's root is |