New version propagation to replace keyword substitution, part 1

3 files changed, 13 insertions, 35 deletions

diff --git a/server/Makefile.in b/server/Makefile.in
index 319c390..7d244be 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -43,11 +43,6 @@ zsrv_err.h: zsrv_err.c
 zsrv_err.c: zsrv_err.et
 	compile_et ${srcdir}/zsrv_err.et
 
-version.o: version.h
-
-version.h: always
-	sh ${srcdir}/new_vers.sh
-
 .c.o:
 	${CC} -c ${ALL_CFLAGS} $<
 
@@ -65,12 +60,11 @@ clean:
 	${LIBTOOL} --mode=clean rm -f zephyrd
 	rm -f ${OBJS} zsrv_err.[ch]
 
-always:
-
 ${OBJS}: zserver.h zsrv_err.h timer.h zsrv_conf.h zstring.h access.h acl.h
 ${OBJS}: ${top_srcdir}/h/internal.h ${top_srcdir}/h/sysdep.h
 ${OBJS}: ${BUILDTOP}/h/config.h ${BUILDTOP}/h/zephyr/zephyr.h
 ${OBJS}: ${BUILDTOP}/h/zephyr/zephyr_err.h
+version.o: ${BUILDTOP}/h/zephyr_version.h
 
-.PHONY: all check install clean always
+.PHONY: all check install clean
 
diff --git a/server/new_vers.sh b/server/new_vers.sh
deleted file mode 100755
index 035b3ff..0000000
--- a/server/new_vers.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-#
-
-u=${USER-the_zephyr_builder}
-h=`hostname`
-t=`date`
-
-umask 002
-/bin/echo "#define ZSERVER_VERSION_STRING \"(${t}) ${u}@${h}\"" >version.h
diff --git a/server/version.c b/server/version.c
index 3f4db17..e572bbf 100644
--- a/server/version.c
+++ b/server/version.c
@@ -15,19 +15,17 @@
 #include <sys/utsname.h>
 
 #include "zserver.h"
-#include "version.h"
+#include <zephyr_version.h>
 
-const char zephyr_version[] = "Zephyr system version 2.0";
+const char zephyr_version[] = "Zephyr system version" ZEPHYR_VERSION_STRING;
 
 #ifdef DEBUG
-const char version[] = "Zephyr server (DEBUG) $Revision$";
+const char version[] = "Zephyr Server (DEBUG) " ZEPHYR_VERSION_STRING;
 #else
-const char version[] = "Zephyr server $Revision$";
+const char version[] = "Zephyr Server " ZEPHYR_VERSION_STRING;
 #endif
 
 #if !defined (lint) && !defined (SABER)
-static const char rcsid_version_c[] =
-    "$Id$";
 static const char copyright[] =
     "Copyright (c) 1987,1988,1989,1990 Massachusetts Institute of Technology.\n";
 #endif
@@ -39,20 +37,15 @@ get_version(void)
   struct utsname un;
 
   if (vers_buf[0] == '\0') {
-#ifdef DEBUG
-    sprintf(vers_buf,"Zephyr Server (DEBUG) $Revision$: %s",
-	    ZSERVER_VERSION_STRING);
-#else
-    sprintf(vers_buf,"Zephyr Server $Revision$: %s",
-	    ZSERVER_VERSION_STRING);
-#endif /* DEBUG */
+      strcpy(vers_buf, version);
 
-    (void) strcat(vers_buf, "/");
+      (void) strcat(vers_buf, "/");
 
-    uname(&un);
-    (void) strcat(vers_buf, un.machine);
-    (void) strcat(vers_buf, "-");
-    (void) strcat(vers_buf, un.sysname);
+      uname(&un);
+      (void) strcat(vers_buf, un.machine);
+      (void) strcat(vers_buf, "-");
+      (void) strcat(vers_buf, un.sysname);
   }
+
   return(vers_buf);
 }