Fix some "make distcheck" errors.

The only issue left is the installation of systemd service files, which
is done to a custom data directory. Make distcheck calls install without
DESTDIR it seems, but running "make install" manually works fine.

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 95580cabedfc91ef32199f8e64ad184ddd5a9d31..16b5a71ca4f231684a7cec72d018da9df5a2d748 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -4,21 +4,10 @@ info_TEXINFOS = tinc.texi
 
 man_MANS = tincd.8 tinc.conf.5
 
-EXTRA_DIST = tincinclude.texi.in tincd.8.in tinc.conf.5.in sample-config.tar.gz
+EXTRA_DIST = tincinclude.texi.in tincd.8.in tinc.conf.5.in sample-config
 
 CLEANFILES = *.html tincd.8 tinc.conf.5 tincinclude.texi
 
-# Use `ginstall' in the definition of man_MANS to avoid
-# confusion with the `install' target.  The install rule transforms `ginstall'
-# to install before applying any user-specified name transformations.
-transform = s/ginstall/install/; @program_transform_name@
-
-# For additional rules usually of interest only to the maintainer,
-# see GNUmakefile and Makefile.maint.
-
-sample-config.tar.gz: $(srcdir)/sample-config
-       $(AM_V_GEN)GZIP=$(GZIP_ENV) $(AMTAR) chozf $@ --exclude .svn $<
-
 texi2html: tinc.texi
        $(AM_V_GEN)texi2html -split=chapter $<
 

diff --git a/src/tincd.c b/src/tincd.c
index 3abd33f00d284fe66524019eb7a44ce6cbf6c7d9..5b6b32940fb737491ec55f52c2653393ed6ed7c0 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -658,8 +658,6 @@ int main(int argc, char **argv) {
                return 1;
        }
 
-       make_names();
-
        if(show_version) {
                printf("%s version %s\n", PACKAGE, VERSION);
                printf("Copyright (C) 1998-2017 Ivo Timmermans, Guus Sliepen and others.\n"
@@ -676,6 +674,8 @@ int main(int argc, char **argv) {
                return 0;
        }
 
+       make_names();
+
        if(kill_tincd) {
                return !kill_other(kill_tincd);
        }