Look in the configured sbin directory for the tincd binary.
authorGuus Sliepen <guus@tinc-vpn.org>
Thu, 11 Dec 2008 13:59:46 +0000 (13:59 +0000)
committerGuus Sliepen <guus@tinc-vpn.org>
Thu, 11 Dec 2008 13:59:46 +0000 (13:59 +0000)
src/Makefile.am
src/tincctl.c

index acbf419..fb0b46c 100644 (file)
@@ -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`
index aed1c31..567e1c3 100644 (file)
@@ -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;
        }