From: Kirill Isakov <bootctl@gmail.com>
Date: Sat, 12 Mar 2022 06:32:01 +0000 (+0600)
Subject: Fix `make distcheck`
X-Git-Url: https://tinc-vpn.org/git/browse?a=commitdiff_plain;h=76ec2548d0a3e2f1ea92da025549e2abce2bf502;p=tinc

Fix `make distcheck`

`make distcheck` builds and then calls both tinc and tincd with two options:

	--version
	--help

tincd behavior was changed by 28b7a53b6 to print usage information to
stderr, but automake expects to see a non-empty output from stdout, and
fails distcheck if it's empty.
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 0d79c906..7d6a31dd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -244,22 +244,22 @@ sptps_speed_SOURCES += \
 else
 if GCRYPT
 tincd_SOURCES += \
-	gcrypt/cipher.c \
+	gcrypt/cipher.c gcrypt/cipher.h \
 	gcrypt/crypto.c \
 	gcrypt/digest.c gcrypt/digest.h \
 	gcrypt/pem.c gcrypt/pem.h \
 	gcrypt/prf.c \
-	gcrypt/rsa.c
+	gcrypt/rsa.c gcrypt/rsa.h
 tinc_SOURCES += \
-	gcrypt/cipher.c \
+	gcrypt/cipher.c gcrypt/cipher.h \
 	gcrypt/crypto.c \
 	gcrypt/digest.c gcrypt/digest.h \
 	gcrypt/pem.c gcrypt/pem.h \
 	gcrypt/prf.c \
-	gcrypt/rsa.c \
+	gcrypt/rsa.c gcrypt/rsa.h \
 	gcrypt/rsagen.c
 sptps_test_SOURCES += \
-	gcrypt/cipher.c \
+	gcrypt/cipher.c gcrypt/cipher.h \
 	gcrypt/crypto.c \
 	gcrypt/digest.c gcrypt/digest.h \
 	gcrypt/prf.c
diff --git a/src/bsd/device.c b/src/bsd/device.c
index 0c1a62f4..badd77d7 100644
--- a/src/bsd/device.c
+++ b/src/bsd/device.c
@@ -28,7 +28,7 @@
 #include "../xalloc.h"
 
 #ifdef ENABLE_TUNEMU
-#include "bsd/tunemu.h"
+#include "tunemu.h"
 #endif
 
 #ifdef HAVE_NET_IF_UTUN_H
diff --git a/src/openssl/rsagen.c b/src/openssl/rsagen.c
index ce0bd0bf..3674057c 100644
--- a/src/openssl/rsagen.c
+++ b/src/openssl/rsagen.c
@@ -17,7 +17,7 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "system.h"
+#include "../system.h"
 
 #include <openssl/pem.h>
 #include <openssl/err.h>
diff --git a/src/tincd.c b/src/tincd.c
index 022fb536..da3f03b1 100644
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -143,7 +143,7 @@ static void usage(bool status) {
 		        "\n"
 		        "Report bugs to tinc@tinc-vpn.org.\n";
 
-		fprintf(stderr, message, program_name);
+		printf(message, program_name);
 	}
 }