From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 21 Oct 2008 12:31:00 +0000 (+1300)
Subject: Restore active part of error page stylesheets
X-Git-Tag: SQUID_3_2_0_1~1386
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee1863f493b30a4848fc0b562078a7d8859bf1a7;p=thirdparty%2Fsquid.git

Restore active part of error page stylesheets

This now uses an adjusted form of errorTryLoadText() which accepts
an absoute path page name and NULL dir instead of errorLoadText()
which is intended only for locating a specific page amongst the error
directory content.
---

ee1863f493b30a4848fc0b562078a7d8859bf1a7
diff --cc errors/Makefile.am
index 6c53194645,79839d25aa..0aeaa4cf15
--- a/errors/Makefile.am
+++ b/errors/Makefile.am
@@@ -70,7 -72,15 +72,15 @@@ install-data-local
  			$(INSTALL_DATA) $$f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l; \
  		done; \
  	  fi \
- 	done
+ 	done; \
 -        $(INSTALL_DATA) $(srcdir)/errorpage.css $(DEFAULT_STYLESHEET).default; \
 -        @if test -f $(DEFAULT_STYLESHEET) ; then \
 -                echo "$@ will not overwrite existing $(DEFAULT_STYLESHEET)" ; \
++        $(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET).default; \
++        @if test -f $(DESTDIR)$(DEFAULT_STYLESHEET) ; then \
++                echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_STYLESHEET)" ; \
+         else \
 -                echo "$(INSTALL_DATA) $(srcdir)/errorpage.css $(DEFAULT_STYLESHEET)"; \
 -                $(INSTALL_DATA) $(srcdir)/errorpage.css $(DEFAULT_STYLESHEET); \
++                echo "$(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET)"; \
++                $(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET); \
+         fi
+ 
  
  uninstall-local:
  	@ for l in $(LANGUAGES); do \
@@@ -84,7 -94,8 +94,8 @@@
  	        	rm -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$l/`basename $$f`; \
  		done; \
  	  fi \
- 	done
+ 	done; \
 -	rm -f $(DEFAULT_STYLESHEET).default
++	rm -f $(DESTDIR)$(DEFAULT_STYLESHEET).default
  
  # undocumented hack.  You can use this target to create multi-lingual
  # error pages.  For example: