From 7c5509ef57aa50733d8bffb0d9ec0751657e9b59 Mon Sep 17 00:00:00 2001
From: des <des@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Tue, 29 May 2007 10:54:42 +0000
Subject: [PATCH] Be more explicit about which files / directories to include
 in a release.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@1477 d4fa192b-c00b-0410-8231-f00ffab90ce4
---
 varnish-cache/Makefile.am           | 4 +++-
 varnish-cache/configure.ac          | 2 ++
 varnish-cache/debian/Makefile.am    | 7 +++++++
 varnish-cache/redhat/Makefile.am    | 5 +++++
 varnish-cache/redhat/varnish.initrc | 6 +++---
 5 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 varnish-cache/debian/Makefile.am
 create mode 100644 varnish-cache/redhat/Makefile.am

diff --git a/varnish-cache/Makefile.am b/varnish-cache/Makefile.am
index 791388c1..9ceb71ff 100644
--- a/varnish-cache/Makefile.am
+++ b/varnish-cache/Makefile.am
@@ -2,4 +2,6 @@
 
 SUBDIRS = include lib bin man etc doc
 
-EXTRA_DIST = LICENSE autogen.sh debian redhat
+SUBDIRS += debian redhat
+
+EXTRA_DIST = LICENSE autogen.sh
diff --git a/varnish-cache/configure.ac b/varnish-cache/configure.ac
index d3896054..ef7cca94 100644
--- a/varnish-cache/configure.ac
+++ b/varnish-cache/configure.ac
@@ -140,5 +140,7 @@ AC_CONFIG_FILES([
     lib/libvarnishapi/Makefile
     lib/libvcl/Makefile
     man/Makefile
+    debian/Makefile
+    redhat/Makefile
 ])
 AC_OUTPUT
diff --git a/varnish-cache/debian/Makefile.am b/varnish-cache/debian/Makefile.am
new file mode 100644
index 00000000..4e12b8f2
--- /dev/null
+++ b/varnish-cache/debian/Makefile.am
@@ -0,0 +1,7 @@
+# $Id$
+
+EXTRA_DIST =								\
+	changelog compat control copyright dirs docs lintian-override	\
+	README.Debian rules TODO varnish.default varnish.examples	\
+	varnish.init varnish.logrotate varnish.postrm			\
+	varnish.varnishlog.init
diff --git a/varnish-cache/redhat/Makefile.am b/varnish-cache/redhat/Makefile.am
new file mode 100644
index 00000000..dc2b202d
--- /dev/null
+++ b/varnish-cache/redhat/Makefile.am
@@ -0,0 +1,5 @@
+# $Id$
+
+EXTRA_DIST =								\
+	README.redhat TODO varnish.initrc varnishlog.initrc		\
+	varnish.logrotate varnish.spec varnish.sysconfig
diff --git a/varnish-cache/redhat/varnish.initrc b/varnish-cache/redhat/varnish.initrc
index 429426a9..c287552b 100755
--- a/varnish-cache/redhat/varnish.initrc
+++ b/varnish-cache/redhat/varnish.initrc
@@ -38,7 +38,7 @@ case "$1" in
 	    echo -n "Please put configuration options in /etc/sysconfig/varnish"
 	    echo_failure
 	else
-	    daemon --pidfile ${PIDFILE} ${DAEMON} "$DAEMON_OPTS" -P ${PIDFILE} > /dev/null 2>&1
+	    daemon ${DAEMON} "$DAEMON_OPTS" -P ${PIDFILE} > /dev/null 2>&1
 	    sleep 1
 	    pkill -0 $PROCNAME
 	    RETVAL=$?
@@ -54,7 +54,7 @@ case "$1" in
 	;;
   stop)
 	echo -n "Stopping varnish HTTP accelerator: "
-	killproc -p $PIDFILE $DAEMON
+	killproc $DAEMON
 	RETVAL=$?
 	if [ $RETVAL -eq 0 ]
 	then
@@ -66,7 +66,7 @@ case "$1" in
 	echo
 	;;
   status)
-	status -p $PIDFILE $PROCNAME
+	status $PROCNAME
 	RETVAL=$?
 	;;
   restart|reload)
-- 
2.39.5