j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
Ivo Timmermans 2000-11-22 16:19:07 +00:00
parent 9e9e1925b9
commit 2ed6813404
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Makefile.am
View file

@ -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)\"

6
src/tincd.c
View file

@ -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)