squid-2.0-make.patch

   1 diff -ruN squid-2.0.RELEASE-org/scripts/Makefile.in squid-2.0.RELEASE/scripts/Makefile.in
   2 --- squid-2.0.RELEASE-org/scripts/Makefile.in   Wed May 14 23:08:14 1997
   3 +++ squid-2.0.RELEASE/scripts/Makefile.in       Tue Oct  6 18:28:45 1998
   4 @@ -23,11 +23,11 @@
   5  install:
   6         @if test ! -d $(exec_prefix); then \
   7                 echo "mkdir $(exec_prefix)"; \
   8 -               mkdir $(exec_prefix); \
   9 +               mkdir -p $(exec_prefix); \
  10         fi
  11         @if test ! -d $(bindir); then \
  12                 echo "mkdir $(bindir)"; \
  13 -               mkdir $(bindir); \
  14 +               mkdir -p $(bindir); \
  15         fi
  16         $(INSTALL_BIN) RunCache $(bindir)
  17         $(INSTALL_BIN) RunAccel $(bindir)
  18 diff -ruN squid-2.0.RELEASE-org/src/Makefile.in squid-2.0.RELEASE/src/Makefile.in
  19 --- squid-2.0.RELEASE-org/src/Makefile.in       Tue Aug 18 01:27:15 1998
  20 +++ squid-2.0.RELEASE/src/Makefile.in   Tue Oct  6 18:34:21 1998
  21 @@ -31,10 +31,10 @@
  22  DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
  23  DEFAULT_MIME_TABLE     = $(sysconfdir)/mime.conf
  24  DEFAULT_DNSSERVER       = $(libexecdir)/$(DNSSERVER_EXE)
  25 -DEFAULT_CACHE_LOG       = $(localstatedir)/logs/cache.log
  26 -DEFAULT_ACCESS_LOG      = $(localstatedir)/logs/access.log
  27 -DEFAULT_STORE_LOG       = $(localstatedir)/logs/store.log
  28 -DEFAULT_PID_FILE        = $(localstatedir)/logs/squid.pid
  29 +DEFAULT_CACHE_LOG       = $(localstatedir)/log/squid/cache.log
  30 +DEFAULT_ACCESS_LOG      = $(localstatedir)/log/squid/access.log
  31 +DEFAULT_STORE_LOG       = $(localstatedir)/log/squid/store.log
  32 +DEFAULT_PID_FILE        = $(localstatedir)/run/squid.pid
  33  DEFAULT_SWAP_DIR        = $(localstatedir)/cache
  34  DEFAULT_PINGER         = $(libexecdir)/$(PINGER_EXE)
  35  DEFAULT_UNLINKD                = $(libexecdir)/$(UNLINKD_EXE)
  36 @@ -258,32 +258,37 @@
  37  install-mkdirs:
  38         -@if test ! -d $(prefix); then \
  39                 echo "mkdir $(prefix)"; \
  40 -               mkdir $(prefix); \
  41 +               mkdir -p $(prefix); \
  42         fi
  43         -@if test ! -d $(exec_prefix); then \
  44                 echo "mkdir $(exec_prefix)"; \
  45 -               mkdir $(exec_prefix); \
  46 +               mkdir -p $(exec_prefix); \
  47         fi
  48         -@if test ! -d $(bindir); then \
  49                 echo "mkdir $(bindir)"; \
  50 -               mkdir $(bindir); \
  51 +               mkdir -p $(bindir); \
  52         fi
  53         -@if test ! -d $(libexecdir); then \
  54                 echo "mkdir $(libexecdir)"; \
  55 -               mkdir $(libexecdir); \
  56 +               mkdir -p $(libexecdir); \
  57         fi
  58         -@if test ! -d $(sysconfdir); then \
  59                 echo "mkdir $(sysconfdir)"; \
  60 -               mkdir $(sysconfdir); \
  61 +               mkdir -p $(sysconfdir); \
  62         fi
  63 -       -@if test ! -d $(localstatedir); then \
  64 -               echo "mkdir $(localstatedir)"; \
  65 -               mkdir $(localstatedir); \
  66 -       fi
  67 -       -@if test ! -d $(localstatedir)/logs; then \
  68 -               echo "mkdir $(localstatedir)/logs"; \
  69 -               mkdir $(localstatedir)/logs; \
  70 +       -@if test ! -d $(localstatedir)/log/squid; then \
  71 +               echo "mkdir $(localstatedir)/log/squid"; \
  72 +               mkdir -p $(localstatedir)/log/squid; \
  73         fi
  74 +       -@if test ! -d $(localstatedir)/spool/squid; then \
  75 +               echo "mkdir $(localstatedir)/spool/squid"; \
  76 +               mkdir -p $(localstatedir)/spool/squid; \
  77 +       fi
  78 +       -@if test ! -d $(localstatedir)/run; then \
  79 +               echo "mkdir $(localstatedir)/run"; \
  80 +               mkdir -p $(localstatedir)/run; \
  81 +       fi
  82 +
  83
  84  # Michael Lupp <mike@nemesis.saar.de> wants to know about additions
  85  # to the install target.