]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Removed broken install tests when installing/uninstalling error pages.
authorhno <>
Thu, 15 Nov 2001 06:09:10 +0000 (06:09 +0000)
committerhno <>
Thu, 15 Nov 2001 06:09:10 +0000 (06:09 +0000)
errors/Makefile.am
errors/Makefile.in

index 70828ea45d63ea6faf81e17ab9ec515ac26fba14..8b221377181b59c5914a31387ae51b586f91b595 100644 (file)
@@ -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
index 7871eef062661c20e0d5b691352e76c68919b2ca..6c2dcf9dfe1d3de49c73ad6245e2b4b05489cc03 100644 (file)
@@ -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