From 2ed68134047a19e708c2a2af32c58968835a7043 Mon Sep 17 00:00:00 2001 From: Ivo Timmermans Date: Wed, 22 Nov 2000 16:19:07 +0000 Subject: [PATCH] Honor the --localstatedir option to configure, instead of hardcoded /var. --- src/Makefile.am | 6 +++--- src/tincd.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index bb83f799..185e5a06 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ ## 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 @@ -18,5 +18,5 @@ tincd_LDADD = \ 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 7118d1f3..d2ce14d0 100644 --- 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. - $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" @@ -248,7 +248,7 @@ void make_names(void) 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 @@ -259,7 +259,7 @@ void make_names(void) else { if(!pidfilename) - pidfilename = "/var/run/tinc.pid"; + pidfilename = LOCALSTATEDIR "/run/tinc.pid"; if(!confbase) asprintf(&confbase, "%s/tinc", CONFDIR); if(!identname) -- 2.39.5