Set kerberosIV version number at only _one_ place.

5 files changed, 20 insertions, 12 deletions

diff --git a/kerberosIV/Makefile.inc b/kerberosIV/Makefile.inc
index 15fb5378bff..a32e6f4dd31 100644
--- a/kerberosIV/Makefile.inc
+++ b/kerberosIV/Makefile.inc
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.11 2000/05/15 18:24:43 hin Exp $
-
-KRBVERSION = "krb4-1.0"
+# $OpenBSD: Makefile.inc,v 1.12 2001/05/03 19:21:51 hin Exp $
 
 KRBDIR	= ${.CURDIR}/${KRBDEPTH}
 KRBSRC	= ${.CURDIR}/${KRBDEPTH}/src
diff --git a/kerberosIV/README b/kerberosIV/README
index 47587fcbdc9..16f9572fe3b 100644
--- a/kerberosIV/README
+++ b/kerberosIV/README
@@ -1,4 +1,4 @@
-$OpenBSD: README,v 1.3 2000/12/29 14:20:49 hin Exp $
+$OpenBSD: README,v 1.4 2001/05/03 19:21:51 hin Exp $
 
 This version is based on version 1.0.2 of the Kerberos IV distribution
 from KTH, which is available from ftp://ftp.pdc.kth.se/pub/krb4/src/.
@@ -9,7 +9,7 @@ UPGRADING
 ---------
 
 1. Import the distribution into src/kerberosIV/src. Dont forget to change
-   all '$Id: README,v 1.3 2000/12/29 14:20:49 hin Exp $' tags etc. to '$KTH: ... $'.
+   all '$Id: README,v 1.4 2001/05/03 19:21:51 hin Exp $' tags etc. to '$KTH: ... $'.
 2. mkdir /tmp/krb 
    cd /tmp/krb 
    /usr/src/kerberosIV/src/configure --disable-otp
@@ -21,7 +21,7 @@ UPGRADING
 
 7. merge in OpenBSD specific changes:
 	src/lib/krb/krb.h		Path to krb.equiv 
-					Remove dependecy on ktypes.h
+					Remove dependency on ktypes.h
 	src/lib/krb/defaults.c		Path to srvtab
 	src/lib/kdb/krb_db.h 		Path to kerberos database changed to 
 					/etc/kerberosIV/principal
@@ -33,8 +33,7 @@ UPGRADING
 8. Update the kafs.h include file with a newer from Arla, this is
    needed for the afs client. *yuk*
 9. Update any other utilities that may need to be changed.
-10. Remember to update version number in these files:
-	lib/roken/print_version.h, src/include/version.h
+10. Remember to update version number in the file src/include/config.h.
 11. If necessary, bump version number on any shared libraries that have
     changed.
 
diff --git a/kerberosIV/lib/roken/print_version.h b/kerberosIV/lib/roken/print_version.h
index dd8f2ce6b08..115c334c12d 100644
--- a/kerberosIV/lib/roken/print_version.h
+++ b/kerberosIV/lib/roken/print_version.h
@@ -1 +1,5 @@
-#define VERSIONLIST { "krb4-1.0.4" }
+/*	$OpenBSD: print_version.h,v 1.4 2001/05/03 19:21:51 hin Exp $	*/
+
+#include <version.h>
+
+#define VERSIONLIST { KRB4_VERSION }
diff --git a/kerberosIV/src/include/config.h b/kerberosIV/src/include/config.h
index 35925fec4a5..83b858db060 100644
--- a/kerberosIV/src/include/config.h
+++ b/kerberosIV/src/include/config.h
@@ -859,7 +859,7 @@
 #define PACKAGE "krb4"
 
 /* Version number of package */
-#define VERSION "1.0.2"
+#define VERSION "1.0.4"
 
 /* Define to what version of SunOS you are running. */
 /* #undef SunOS */
diff --git a/kerberosIV/src/include/version.h b/kerberosIV/src/include/version.h
index 2a725a1e41f..5a253ef17cb 100644
--- a/kerberosIV/src/include/version.h
+++ b/kerberosIV/src/include/version.h
@@ -1,2 +1,9 @@
-char *krb4_long_version = "@(#)$Version: krb4-1.0.4 $";
-char *krb4_version = "krb4-1.0.4";
+/*	$OpenBSD: version.h,v 1.3 2001/05/03 19:21:51 hin Exp $	*/
+
+#include <config.h>
+
+/* Use PACKAGE and VERSION in config.h to build a suitable version string */
+#define KRB4_VERSION PACKAGE "-" VERSION
+
+char *krb4_long_version = "@(#)$Version: " KRB4_VERSION " $";
+char *krb4_version = KRB4_VERSION;