From: hno <>
Date: Thu, 15 Nov 2001 06:09:10 +0000 (+0000)
Subject: Removed broken install tests when installing/uninstalling error pages.
X-Git-Tag: SQUID_3_0_PRE1~1294
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dedd9cfc84dd37af3786d4d2fb1443f2056fba4e;p=thirdparty%2Fsquid.git

Removed broken install tests when installing/uninstalling error pages.
---

diff --git a/errors/Makefile.am b/errors/Makefile.am
index 70828ea45d..8b22137718 100644
--- a/errors/Makefile.am
+++ b/errors/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 #
-# $Id: Makefile.am,v 1.1 2001/08/31 11:19:08 robertc Exp $
+# $Id: Makefile.am,v 1.2 2001/11/14 23:09:10 hno Exp $
 #
 
 errordir = $(sysconfdir)/errors
@@ -20,19 +20,13 @@ LANGUAGES	= Bulgarian Czech Danish Dutch English Estonian Finnish French \
 install-data-local: 
 	-@$(mkinstalldirs) $(DESTDIR)$(DEFAULT_ERROR_DIR)
 	@for f in $(srcdir)/$(LANGUAGE)/ERR_*; do \
-		if test -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$f ; then \
-			:; \
-		else \
-			echo "$(INSTALL_DATA) $$f $(DESTDIR)$(DEFAULT_ERROR_DIR)"; \
-			$(INSTALL_DATA) $$f $(DESTDIR)$(DEFAULT_ERROR_DIR); \
-		fi; \
+		echo "$(INSTALL_DATA) $$f $(DESTDIR)$(DEFAULT_ERROR_DIR)"; \
+		$(INSTALL_DATA) $$f $(DESTDIR)$(DEFAULT_ERROR_DIR); \
 	done
 
 uninstall-local:
 	@for f in $(srcdir)/$(LANGUAGE)/ERR_*; do \
-	        if test -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/`echo $$f | echo "$$f" | sed -e "s/.*\///;"` ; then \
-	                rm -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/`echo $$f | echo "$$f" | sed -e "s/.*\///;"`; \
-	        fi; \
+		rm -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/`basename $$f`; \
 	done
 
 # undocumented hack.  You can use this target to create multi-lingual
diff --git a/errors/Makefile.in b/errors/Makefile.in
index 7871eef062..6c2dcf9dfe 100644
--- a/errors/Makefile.in
+++ b/errors/Makefile.in
@@ -14,7 +14,7 @@
 @SET_MAKE@
 
 #
-# $Id: Makefile.in,v 1.10 2001/10/03 14:56:52 hno Exp $
+# $Id: Makefile.in,v 1.11 2001/11/14 23:09:10 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -255,19 +255,13 @@ uninstall-am: uninstall-info-am uninstall-local
 install-data-local: 
 	-@$(mkinstalldirs) $(DESTDIR)$(DEFAULT_ERROR_DIR)
 	@for f in $(srcdir)/$(LANGUAGE)/ERR_*; do \
-		if test -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$f ; then \
-			:; \
-		else \
-			echo "$(INSTALL_DATA) $$f $(DESTDIR)$(DEFAULT_ERROR_DIR)"; \
-			$(INSTALL_DATA) $$f $(DESTDIR)$(DEFAULT_ERROR_DIR); \
-		fi; \
+		echo "$(INSTALL_DATA) $$f $(DESTDIR)$(DEFAULT_ERROR_DIR)"; \
+		$(INSTALL_DATA) $$f $(DESTDIR)$(DEFAULT_ERROR_DIR); \
 	done
 
 uninstall-local:
 	@for f in $(srcdir)/$(LANGUAGE)/ERR_*; do \
-	        if test -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/`echo $$f | echo "$$f" | sed -e "s/.*\///;"` ; then \
-	                rm -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/`echo $$f | echo "$$f" | sed -e "s/.*\///;"`; \
-	        fi; \
+		rm -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/`basename $$f`; \
 	done
 
 # undocumented hack.  You can use this target to create multi-lingual