From: Guus Sliepen <guus@tinc-vpn.org>
Date: Thu, 11 Dec 2008 13:59:46 +0000 (+0000)
Subject: Look in the configured sbin directory for the tincd binary.
X-Git-Tag: release-1.1pre1~132
X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=40bebbb19fd69fa094e2f6c3c1474adc0105b048

Look in the configured sbin directory for the tincd binary.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index acbf4193..fb0b46cd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,7 +30,7 @@ tincctl_LDADD = \
 
 localedir = $(datadir)/locale
 
-AM_CFLAGS = @CFLAGS@ -DCONFDIR=\"$(sysconfdir)\" -DLOCALEDIR=\"$(localedir)\" -DLOCALSTATEDIR=\"$(localstatedir)\"
+AM_CFLAGS = @CFLAGS@ -DCONFDIR=\"$(sysconfdir)\" -DLOCALEDIR=\"$(localedir)\" -DLOCALSTATEDIR=\"$(localstatedir)\" -DSBINDIR=\"$(sbindir)\"
 
 dist-hook:
 	rm -f `find . -type l`
diff --git a/src/tincctl.c b/src/tincctl.c
index aed1c315..567e1c3d 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -487,7 +487,7 @@ int main(int argc, char *argv[], char *envp[]) {
 
 	if(!strcasecmp(argv[optind], "start")) {
 		argv[optind] = NULL;
-		execve("tincd", argv, envp);
+		execve(SBINDIR "/tincd", argv, envp);
 		fprintf(stderr, _("Could not start tincd: %s"), strerror(errno));
 		return 1;
 	}