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

diff --git a/varnish-cache/Makefile.am b/varnish-cache/Makefile.am
index 791388c196f3172f9c46de48a0192744b831169c..9ceb71ffd0412104bf9b295dde816fe55dcb16e1 100644 (file)
--- 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 d389605400bf1a35e223fad31b5acdd21b9f3c30..ef7cca94d8627c7ffd33af611f5278d5dbd95c54 100644 (file)
--- 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 (file)
index 0000000..4e12b8f
--- /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 (file)
index 0000000..dc2b202
--- /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 429426a963197d5829837ba5b9409b9c486c3391..c287552be554771afb9dc47ffcf931a5416f6afc 100755 (executable)
--- 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)