From 8854e46a50a0272578599d2fcd8d1fb363e19c38 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 23 Jan 2017 11:03:56 +0100
Subject: Add a git suffix to the version number used by all programs.

This uses a setlocalversion script derived from the kernel's
scripts/setlocalversion.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---
 kiss/kissattach.c | 3 ++-
 kiss/kissnetd.c   | 9 +++++----
 kiss/kissparms.c  | 3 ++-
 kiss/mkiss.c      | 5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'kiss')

diff --git a/kiss/kissattach.c b/kiss/kissattach.c
index e30ed05..f4ff5cb 100644
--- a/kiss/kissattach.c
+++ b/kiss/kissattach.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 
 #include <config.h>
+#include <scm-version.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -254,7 +255,7 @@ int main(int argc, char *argv[])
 			}
 			break;
 		case 'v':
-			printf("%s: %s\n", progname, VERSION);
+			printf("%s: %s\n", progname, FULL_VER);
 			return 0;
 		case ':':
 		case '?':
diff --git a/kiss/kissnetd.c b/kiss/kissnetd.c
index 366bb89..7b64ad9 100644
--- a/kiss/kissnetd.c
+++ b/kiss/kissnetd.c
@@ -25,6 +25,7 @@
 #include <limits.h>
 
 #include <config.h>
+#include <scm-version.h>
 
 static int VerboseMode;
 static int MaxFrameSize = 512;
@@ -58,7 +59,7 @@ static void Usage(void)
 static void Banner(int Small)
 {
 	if (Small) {
-		printf("kissnetd V %s by Frederic RIBLE F1OAT - ATEPRA FPAC/Linux Project\n", VERSION);
+		printf("kissnetd V %s by Frederic RIBLE F1OAT - ATEPRA FPAC/Linux Project\n", FULL_VER);
 	}
 	else {
 		printf("****************************************\n");
@@ -66,9 +67,9 @@ static void Banner(int Small)
 		printf("*      ATEPRA FPAC/Linux Project       *\n");
 		printf("****************************************\n");
 		printf("* %*skissnetd Version %s%*s*\n",
-		       (int) (10 - strlen(VERSION) / 2), "",
-		       VERSION,
-		       (int) (10 - (strlen(VERSION) + 1)) / 2, "");
+		       (int) (10 - strlen(FULL_VER) / 2), "",
+		       FULL_VER,
+		       (int) (10 - (strlen(FULL_VER) + 1)) / 2, "");
 		printf("*        by Frederic RIBLE F1OAT       *\n");
 		printf("****************************************\n");
 	}
diff --git a/kiss/kissparms.c b/kiss/kissparms.c
index fc57f7b..6a27dc7 100644
--- a/kiss/kissparms.c
+++ b/kiss/kissparms.c
@@ -5,6 +5,7 @@
 #include <ctype.h>
 
 #include <config.h>
+#include <scm-version.h>
 
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -127,7 +128,7 @@ int main(int argc, char *argv[])
 			break;
 
 		case 'v':
-			printf("kissparms: %s\n", VERSION);
+			printf("kissparms: %s\n", FULL_VER);
 			return 0;
 
 		case 'x':
diff --git a/kiss/mkiss.c b/kiss/mkiss.c
index a50e91c..3d709de 100644
--- a/kiss/mkiss.c
+++ b/kiss/mkiss.c
@@ -58,6 +58,7 @@
 #include <netax25/daemon.h>
 
 #include <config.h>
+#include <scm-version.h>
 
 #define FLEX_CRC	2
 #define G8BPQ_CRC	1
@@ -385,7 +386,7 @@ static void report(void)
 	long t;
 
 	time(&t);
-	syslog(LOG_INFO, "version %s.", VERSION);
+	syslog(LOG_INFO, "version %s.", FULL_VER);
 	syslog(LOG_INFO, "Status report at %s", ctime(&t));
 	syslog(LOG_INFO, "Hardware handshaking %sabled.",
 	       hwflag  ? "en" : "dis");
@@ -462,7 +463,7 @@ int main(int argc, char *argv[])
 			}
 			break;
 		case 'v':
-			printf("mkiss: %s\n", VERSION);
+			printf("mkiss: %s\n", FULL_VER);
 			return 1;
 		case ':':
 		case '?':
-- 
cgit v1.2.3