$NetBSD: patch-aa,v 1.12 2003/03/25 17:44:23 taca Exp $

--- src/Makefile.in.orig	2003-02-12 11:03:14.000000000 +0900
+++ src/Makefile.in
@@ -378,14 +378,15 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
 DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
 DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
 DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
-DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid
+DEFAULT_PID_FILE = /var/run/squid.pid
 DEFAULT_SWAP_DIR = $(localstatedir)/cache
 DEFAULT_PINGER = $(libexecdir)/pinger$(EXEEXT)
 DEFAULT_UNLINKD = $(libexecdir)/unlinkd$(EXEEXT)
 DEFAULT_DISKD = $(libexecdir)/diskd$(EXEEXT)
-DEFAULT_ICON_DIR = $(datadir)/icons
-DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@
-DEFAULT_MIB_PATH = $(datadir)/mib.txt
+DEFAULT_ICON_DIR = $(datadir)/squid/icons
+DEFAULT_ERROR_DIR = $(datadir)/squid/errors/@ERR_DEFAULT_LANGUAGE@
+DEFAULT_MIB_PATH = $(datadir)/squid/mib.txt
+EXAMPLES_DIR = $(datadir)/examples/squid
 
 DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
 
@@ -836,20 +837,20 @@ CCDEPMODE = @CCDEPMODE@
 uninstall-info-am:
 install-dataDATA: $(data_DATA)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(datadir)
+	$(mkinstalldirs) $(DESTDIR)$(datadir)/squid
 	@list='$(data_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/$$f"; \
-	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/$$f; \
+	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/squid/$$f"; \
+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/squid/$$f; \
 	done
 
 uninstall-dataDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(data_DATA)'; for p in $$list; do \
 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(datadir)/$$f"; \
-	  rm -f $(DESTDIR)$(datadir)/$$f; \
+	  echo " rm -f $(DESTDIR)$(datadir)/squid/$$f"; \
+	  rm -f $(DESTDIR)$(datadir)/squid/$$f; \
 	done
 install-sysconfDATA: $(sysconf_DATA)
 	@$(NORMAL_INSTALL)
@@ -1048,7 +1049,7 @@ info-am:
 install-data-am: install-data-local install-dataDATA
 
 install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \
-	install-sbinPROGRAMS install-sysconfDATA
+	install-sbinPROGRAMS
 
 install-info: install-info-recursive
 
@@ -1066,7 +1067,7 @@ mostlyclean-am: mostlyclean-compile most
 
 uninstall-am: uninstall-binPROGRAMS uninstall-dataDATA uninstall-info-am \
 	uninstall-libexecPROGRAMS uninstall-local \
-	uninstall-sbinPROGRAMS uninstall-sysconfDATA
+	uninstall-sbinPROGRAMS
 
 uninstall-info: uninstall-info-recursive
 
@@ -1149,19 +1150,12 @@ repl_modules.c: repl_modules.sh Makefile
 auth_modules.c: auth_modules.sh Makefile
 	@$(SHELL) $(srcdir)/auth_modules.sh $(AUTH_MODULES) >auth_modules.c
 
-install-data-local: install-sysconfDATA install-dataDATA
-	@if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \
-	        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_MIME_TABLE)" ; \
-	else \
-	        echo "$(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(DEFAULT_MIME_TABLE)" ;\
-	        $(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(DEFAULT_MIME_TABLE); \
-	fi
-	@if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
-	        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \
-	else \
-	        echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
-	        $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
-	fi
+install-data-local: install-dataDATA
+	@mkdir -p $(DESTDIR)$(EXAMPLES_DIR)
+	@echo "$(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(EXAMPLES_DIR)/mime.conf" ;\
+	        $(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(EXAMPLES_DIR)/mime.conf
+	@echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(EXAMPLES_DIR)/suqid.conf"; \
+	        $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(EXAMPLES_DIR)/squid.conf
 	$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX)
 
 uninstall-local: