---------------------
PatchSet 2364 
Date: 2001/05/21 10:57:10
Author: rbcollins
Branch: squid-amake
Tag: (none) 
Log:
support DESTDIR for the custom targets

Members: 
	errors/Makefile.am:1.1.2.4->1.1.2.5 
	src/Makefile.am:1.1.2.29->1.1.2.30 

Index: squid/errors/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid/errors/Makefile.am,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- squid/errors/Makefile.am	20 Apr 2001 23:43:29 -0000	1.1.2.4
+++ squid/errors/Makefile.am	21 May 2001 10:57:10 -0000	1.1.2.5
@@ -20,18 +20,18 @@
 install-data-local: 
 	-@$(mkinstalldirs) $(DESTDIR)$(DEFAULT_ERROR_DIR)
 	@for f in $(srcdir)/$(LANGUAGE)/ERR_*; do \
-		if test -f $(DEFAULT_ERROR_DIR)/$$f ; then \
+		if test -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/$$f ; then \
 			:; \
 		else \
-			echo "$(INSTALL_DATA) $$f $(DEFAULT_ERROR_DIR)"; \
-			$(INSTALL_DATA) $$f $(DEFAULT_ERROR_DIR); \
+			echo "$(INSTALL_DATA) $$f $(DESTDIR)$(DEFAULT_ERROR_DIR)"; \
+			$(INSTALL_DATA) $$f $(DESTDIR)$(DEFAULT_ERROR_DIR); \
 		fi; \
 	done
 
 uninstall-local:
 	@for f in $(srcdir)/$(LANGUAGE)/ERR_*; do \
-	        if test -f $(DEFAULT_ERROR_DIR)/`echo $$f | echo "$$f" | sed -e "s/.*\///;"` ; then \
-	                rm -f $(DEFAULT_ERROR_DIR)/`echo $$f | echo "$$f" | sed -e "s/.*\///;"`; \
+	        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; \
 	done
 
Index: squid/src/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Makefile.am,v
retrieving revision 1.1.2.29
retrieving revision 1.1.2.30
diff -u -r1.1.2.29 -r1.1.2.30
--- squid/src/Makefile.am	16 May 2001 00:52:37 -0000	1.1.2.29
+++ squid/src/Makefile.am	21 May 2001 10:57:10 -0000	1.1.2.30
@@ -174,27 +174,27 @@
 	@$(SHELL) $(srcdir)/auth_modules.sh $(AUTH_MODULES) >auth_modules.c
 
 install-data-local:
-	@if test -f $(sysconfdir)/mime.conf ; then \
-	        echo "$@ will not overwrite existing $(sysconfdir)/mime.conf" ; \
+	@if test -f $(DESTDIR)$(sysconfdir)/mime.conf ; then \
+	        echo "$@ will not overwrite existing $(DESTDIR)$(sysconfdir)/mime.conf" ; \
 	else \
-	        echo "$(INSTALL_DATA) $(srcdir)/mime.conf.default $(sysconfdir)/mime.conf" ;\
-	        $(INSTALL_DATA) $(srcdir)/mime.conf.default $(sysconfdir)/mime.conf; \
+	        echo "$(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(sysconfdir)/mime.conf" ;\
+	        $(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(sysconfdir)/mime.conf; \
 	fi
-	@if test -f $(sysconfdir)/squid.conf ; then \
-	        echo "$@ will not overwrite existing $(sysconfdir)/squid.conf" ; \
+	@if test -f $(DESTDIR)$(sysconfdir)/squid.conf ; then \
+	        echo "$@ will not overwrite existing $(DESTDIR)$(sysconfdir)/squid.conf" ; \
 	else \
-	        echo "$(INSTALL_DATA) squid.conf.default $(sysconfdir)/squid.conf"; \
-	        $(INSTALL_DATA) squid.conf.default $(sysconfdir)/squid.conf; \
+	        echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(sysconfdir)/squid.conf"; \
+	        $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(sysconfdir)/squid.conf; \
 	fi
 
 uninstall-local:
-	@if test -f $(sysconfdir)/mime.conf ; then \
-		echo "rm -f $(sysconfdir)/mime.conf"; \
-		$(RM) -f $(sysconfdir)/mime.conf; \
+	@if test -f $(DESTDIR)$(sysconfdir)/mime.conf ; then \
+		echo "rm -f $(DESTDIR)$(sysconfdir)/mime.conf"; \
+		$(RM) -f $(DESTDIR)$(sysconfdir)/mime.conf; \
 	fi
-	@if test -f $(sysconfdir)/squid.conf ; then \
-		echo "rm -f $(sysconfdir)/squid.conf"; \
-		$(RM) -f $(sysconfdir)/squid.conf; \
+	@if test -f $(DESTDIR)$(sysconfdir)/squid.conf ; then \
+		echo "rm -f $(DESTDIR)$(sysconfdir)/squid.conf"; \
+		$(RM) -f $(DESTDIR)$(sysconfdir)/squid.conf; \
 	fi
 
 DISTCLEANFILES = cf_gen_defines.h cf.data cf_parser.h squid.conf.default \