Honor the --localstatedir option to configure, instead of hardcoded /var.

diff --git a/src/Makefile.am b/src/Makefile.am
index bb83f79..185e5a0 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 ## Produce this file with automake to get Makefile.in
 ## Produce this file with automake to get Makefile.in

-# $Id: Makefile.am,v 1.4.4.9 2000/11/20 19:12:11 guus Exp $
+# $Id: Makefile.am,v 1.4.4.10 2000/11/22 16:19:06 zarq Exp $

 
 sbin_PROGRAMS = tincd
 
 
 sbin_PROGRAMS = tincd
 


@@ -18,5 +18,5 @@ tincd_LDADD = \
 
 localedir = $(datadir)/locale
 
 
 localedir = $(datadir)/locale
 

-CFLAGS = @CFLAGS@ -DPKGLIBDIR=$(pkglibdir) -DCONFDIR=\"@sysconfdir@\"  \
-       -DLOCALEDIR=\"$(localedir)\"
+CFLAGS = @CFLAGS@ -DPKGLIBDIR=$(pkglibdir) -DCONFDIR=\"$(sysconfdir)\" \
+       -DLOCALEDIR=\"$(localedir)\" -DLOCALSTATEDIR=\"$(localstatedir)\"

diff --git a/src/tincd.c b/src/tincd.c
index 7118d1f..d2ce14d 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 

-    $Id: tincd.c,v 1.10.4.32 2000/11/20 22:13:14 guus Exp $
+    $Id: tincd.c,v 1.10.4.33 2000/11/22 16:19:07 zarq Exp $

 */
 
 #include "config.h"
 */
 
 #include "config.h"


@@ -248,7 +248,7 @@ void make_names(void)
   if(netname)
     {
       if(!pidfilename)
   if(netname)
     {
       if(!pidfilename)

-        asprintf(&pidfilename, "/var/run/tinc.%s.pid", netname);
+        asprintf(&pidfilename, LOCALSTATEDIR "/run/tinc.%s.pid", netname);

       if(!confbase)
         asprintf(&confbase, "%s/tinc/%s", CONFDIR, netname);
       else
       if(!confbase)
         asprintf(&confbase, "%s/tinc/%s", CONFDIR, netname);
       else


@@ -259,7 +259,7 @@ void make_names(void)
   else
     {
       if(!pidfilename)
   else
     {
       if(!pidfilename)

-        pidfilename = "/var/run/tinc.pid";
+        pidfilename = LOCALSTATEDIR "/run/tinc.pid";

       if(!confbase)
         asprintf(&confbase, "%s/tinc", CONFDIR);
       if(!identname)
       if(!confbase)
         asprintf(&confbase, "%s/tinc", CONFDIR);
       if(!identname)