bootstrapped

diff --git a/configure b/configure
index f58fbe6a3a6aab3dc709c4096c91b0740c13f5ab..6209efd45911064d6f9f68c1ffe9b4d85c2d161c 100755 (executable)
--- a/configure
+++ b/configure
@@ -1018,7 +1018,7 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 
   
 
-# From configure.in Revision: 1.249 
+# From configure.in Revision: 1.250 
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
 echo "configure:1024: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
@@ -7813,7 +7813,6 @@ trap 'rm -fr `echo "\
        src/fs/ufs/Makefile \
        src/repl/heap/Makefile \
        src/repl/lru/Makefile \
-       
  include/autoconf.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
@@ -8029,7 +8028,6 @@ CONFIG_FILES=\${CONFIG_FILES-"\
        src/fs/ufs/Makefile \
        src/repl/heap/Makefile \
        src/repl/lru/Makefile \
-       
 "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF

diff --git a/errors/Makefile.in b/errors/Makefile.in
index e753a6ca19c7584d4f68f4a62e04838431b6e6f8..70be00f772f6e9c9e44e9a549a642ff4741a4e91 100644 (file)
--- a/errors/Makefile.in
+++ b/errors/Makefile.in
@@ -14,7 +14,7 @@
 @SET_MAKE@
 
 #
-# $Id: Makefile.in,v 1.14 2001/11/30 14:53:07 hno Exp $
+# $Id: Makefile.in,v 1.15 2001/11/30 15:35:45 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -122,7 +122,7 @@ am__quote = @am__quote@
 install_sh = @install_sh@
 makesnmplib = @makesnmplib@
 
-errordir = $(datadir)/squid/errors
+errordir = $(datadir)/errors
 
 DEFAULT_ERROR_DIR = $(errordir)
 

diff --git a/icons/Makefile.in b/icons/Makefile.in
index 19102a8e8c50a5c8b2b990466d4d4e17a558a558..4d47a1b88023e86fabbd8fb638f3fae284e51764 100644 (file)
--- a/icons/Makefile.in
+++ b/icons/Makefile.in
@@ -13,7 +13,7 @@
 
 @SET_MAKE@
 
-# $Id: Makefile.in,v 1.20 2001/11/30 14:53:08 hno Exp $
+# $Id: Makefile.in,v 1.21 2001/11/30 15:35:46 hno Exp $
 #
 
 SHELL = @SHELL@
@@ -150,7 +150,7 @@ ICON2 = anthony-bomb.gif \
                anthony-xpm.gif
 
 
-icondir = $(datadir)/squid/icons
+icondir = $(datadir)/icons
 icon_DATA = $(ICON1) $(ICON2)
 EXTRA_DIST = $(ICON1) $(ICON2) icons.shar
 DISTCLEANFILES = $(ICON1) $(ICON2)

diff --git a/src/Makefile.in b/src/Makefile.in
index 387c0791348c0a413388c93478ae7044dd95b73d..ae732754d36b925dc85dc1527e749c62c514d67a 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.223 2001/11/30 14:53:09 hno Exp $
+#  $Id: Makefile.in,v 1.224 2001/11/30 15:35:47 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -346,10 +346,13 @@ BUILT_SOURCES = \
 
 sysconf_DATA = \
        squid.conf.default \
-       mib.txt \
        mime.conf.default
 
 
+data_DATA = \
+       mib.txt
+
+
 LDADD = -L../lib -lmiscutil @XTRA_LIBS@
 
 EXTRA_DIST = \
@@ -377,9 +380,9 @@ DEFAULT_SWAP_DIR = $(localstatedir)/cache
 DEFAULT_PINGER = $(libexecdir)/@OPT_PINGER_EXE@
 DEFAULT_UNLINKD = $(libexecdir)/$(UNLINKD_EXE)
 DEFAULT_DISKD = $(libexecdir)/@OPT_DISKD_EXE@
-DEFAULT_ICON_DIR = $(datadir)/squid/icons
-DEFAULT_ERROR_DIR = $(datadir)/squid/errors/@ERR_DEFAULT_LANGUAGE@
-DEFAULT_MIB_PATH = $(sysconfdir)/mib.txt
+DEFAULT_ICON_DIR = $(datadir)/icons
+DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@
+DEFAULT_MIB_PATH = $(datadir)/mib.txt
 
 DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
 
@@ -560,7 +563,7 @@ CFLAGS = @CFLAGS@
 DIST_SOURCES = cachemgr.c $(cf_gen_SOURCES) client.c dnsserver.c \
        $(pinger_SOURCES) $(squid_SOURCES) $(EXTRA_squid_SOURCES) \
        $(unlinkd_SOURCES)
-DATA = $(sysconf_DATA)
+DATA = $(data_DATA) $(sysconf_DATA)
 
 
 RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
@@ -780,6 +783,23 @@ distclean-depend:
        $(COMPILE) -c `cygpath -w $<`
 CCDEPMODE = @CCDEPMODE@
 uninstall-info-am:
+install-dataDATA: $(data_DATA)
+       @$(NORMAL_INSTALL)
+       $(mkinstalldirs) $(DESTDIR)$(datadir)
+       @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; \
+       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; \
+       done
 install-sysconfDATA: $(sysconf_DATA)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
@@ -929,7 +949,7 @@ check: check-recursive
 all-am: Makefile $(PROGRAMS) $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
-       $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(libexecdir) $(DESTDIR)$(sysconfdir)
+       $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(libexecdir) $(DESTDIR)$(datadir) $(DESTDIR)$(sysconfdir)
 
 install: install-recursive
 install-exec: install-exec-recursive
@@ -974,7 +994,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-data-local install-dataDATA
 
 install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \
        install-sysconfDATA
@@ -993,7 +1013,7 @@ mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
+uninstall-am: uninstall-binPROGRAMS uninstall-dataDATA uninstall-info-am \
        uninstall-libexecPROGRAMS uninstall-local uninstall-sysconfDATA
 
 uninstall-info: uninstall-info-recursive
@@ -1005,17 +1025,19 @@ uninstall-info: uninstall-info-recursive
        distclean-recursive distclean-tags distdir dvi dvi-am \
        dvi-recursive info info-am info-recursive install install-am \
        install-binPROGRAMS install-data install-data-am \
-       install-data-local install-data-recursive install-exec \
-       install-exec-am install-exec-recursive install-info \
-       install-info-am install-info-recursive install-libexecPROGRAMS \
-       install-man install-recursive install-strip install-sysconfDATA \
-       installcheck installcheck-am installdirs installdirs-am \
-       installdirs-recursive maintainer-clean maintainer-clean-generic \
+       install-data-local install-data-recursive install-dataDATA \
+       install-exec install-exec-am install-exec-recursive \
+       install-info install-info-am install-info-recursive \
+       install-libexecPROGRAMS install-man install-recursive \
+       install-strip install-sysconfDATA installcheck installcheck-am \
+       installdirs installdirs-am installdirs-recursive \
+       maintainer-clean maintainer-clean-generic \
        maintainer-clean-recursive mostlyclean mostlyclean-compile \
        mostlyclean-generic mostlyclean-recursive tags tags-recursive \
-       uninstall uninstall-am uninstall-binPROGRAMS uninstall-info-am \
-       uninstall-info-recursive uninstall-libexecPROGRAMS \
-       uninstall-local uninstall-recursive uninstall-sysconfDATA
+       uninstall uninstall-am uninstall-binPROGRAMS uninstall-dataDATA \
+       uninstall-info-am uninstall-info-recursive \
+       uninstall-libexecPROGRAMS uninstall-local uninstall-recursive \
+       uninstall-sysconfDATA
 
 cf_gen.$(OBJEXT): cf_gen_defines.h
 unlinkd-daemon.o: unlinkd.c
@@ -1075,7 +1097,7 @@ 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-data-local: install-sysconfDATA install-dataDATA
        @if test -f $(DESTDIR)$(sysconfdir)/mime.conf ; then \
                echo "$@ will not overwrite existing $(DESTDIR)$(sysconfdir)/mime.conf" ; \
        else \