From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 16 Dec 2014 11:01:29 +0000 (+1300)
Subject: SourceLayout: shuffle Sys-V init script to tools/sysvinit/
X-Git-Tag: merge-candidate-3-v1~439
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a35a0ac751aae7f94f1ba5c0532accaccde27ab5;p=thirdparty%2Fsquid.git

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

diff --git a/configure.ac b/configure.ac
index 2c598b658e..222ba2df7f 100644
--- 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 c92ff15314..2c09b4fa0e 100644
--- 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 0f3fa5f00a..91b9f3d3bf 100644
--- 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
index 0000000000..22d1d21457
--- /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 2de6c38dd8..4d68a4f394 100644
--- 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