SourceLayout: shuffle Sys-V init script to tools/sysvinit/

diff --git a/configure.ac b/configure.ac
index 2c598b658e8b34cec3c414b1b2656ffbafbd5acf..222ba2df7ffa0099e2dae7b472a3755e83d7519c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3835,8 +3835,9 @@ AC_CONFIG_FILES([
        helpers/storeid_rewrite/file/Makefile
        tools/Makefile
        tools/helper-mux/Makefile
-       tools/squidclient/Makefile
        tools/purge/Makefile
+       tools/squidclient/Makefile
+       tools/sysvinit/Makefile
 ])
 
 # must configure libltdl subdir unconditionally for "make distcheck" to work

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index c92ff15314c3985790f2cbc3d365edbc2fa94ef7..2c09b4fa0e11808ec6477d213ccf24f72af978a6 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -10,13 +10,12 @@
 # using a SVR4-based startup mechanism/file system layout
 #
 
-SQUID_RC        = squid.rc
+SQUID_RC        = $(top_srcdir)/tools/sysvinit/squid.rc
 SQUID_OPTIONS   = squid.options
 
 EXTRA_DIST = \
        squid.options \
        config.site \
-       squid.rc \
        user-agents.pl \
        url-normalizer.pl \
        nextstep/Makefile \

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 0f3fa5f00a6ad9446e25e5802306d38d685d7c03..91b9f3d3bfca47e30fc29e77132e95b131da3c15 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -12,7 +12,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 ## we need our local files too (but avoid -I. at all costs)
 AM_CPPFLAGS += -I$(srcdir)
 
-SUBDIRS = helper-mux purge squidclient
+SUBDIRS = helper-mux purge squidclient sysvinit
 EXTRA_DIST = 
 man_MANS = 
 DISTCLEANFILES = 

diff --git a/tools/sysvinit/Makefile.am b/tools/sysvinit/Makefile.am
new file mode 100644 (file)
index 0000000..22d1d21
--- /dev/null
+++ b/tools/sysvinit/Makefile.am
@@ -0,0 +1,10 @@
+## Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+##
+## Squid software is distributed under GPLv2+ license and includes
+## contributions from numerous individuals and organizations.
+## Please see the COPYING and CONTRIBUTORS files for details.
+##
+
+AUTOMAKE_OPTIONS = subdir-objects
+
+EXTRA_DIST = squid.rc

diff --git a/contrib/squid.rc b/tools/sysvinit/squid.rc
similarity index 88%
rename from contrib/squid.rc
rename to tools/sysvinit/squid.rc
index 2de6c38dd86d111a06b271dfe0307929255e9b70..4d68a4f394957efc943be9da9f67c77fadb062b5 100644 (file)
--- a/contrib/squid.rc
+++ b/tools/sysvinit/squid.rc
@@ -1,7 +1,14 @@
-#!/sbin/sh
+#!/bin/sh
+#
+## Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+##
+## Squid software is distributed under GPLv2+ license and includes
+## contributions from numerous individuals and organizations.
+## Please see the COPYING and CONTRIBUTORS files for details.
+##
 
 # Squid Internet Object Cache startup
-# AUTHOR: Markus Gyger
+# AUTHOR: Markus Gyger <mgyger@itr.ch>
 # This is squid's startup file /sbin/init.d/squid or /etc/init.d/squid