Fix some silly mistakes in Linux versioning update.

diff --git a/Makefile.conf b/Makefile.conf
index 809f61048747312a30c76047ab57dd79f10bc9fe..5bb179d11442c35dff8e08a887d05fe8bf6f2534 100644 (file)
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -43,12 +43,15 @@ COPTS = $(BINDDEF)
 #BINDDEF = -DNSUPDATE 
 ##--nsupdate--
 
-##--majver
+# Major version number (if applicable)
+##--majver--
 MAJORVERSION=MajorVersion
-##--majver
-##--minver
+##--majver--
+
+# Minor version number (if applicable)
+##--minver--
 MINORVERSION=MinorVersion
-##--minver
+##--minver--
 
 ## Porting::
 #

diff --git a/configure b/configure
index 38437a33169fdd2786e13a2e9ab9d81163ba00f8..438fc83a75398c9dc9e663d3b6ef17b243213684 100755 (executable)
--- a/configure
+++ b/configure
@@ -32,8 +32,8 @@ if [ "$sysname" = "" ]; then
       fi;;
     Linux)
       release=`uname -r`
-      minor=`echo $release |sed -e 's/[0-9]*\.\([0-9][0-9]*\)$/\1/'`
-      major=`echo $release |sed -e 's/\([0-9][0-9]*\)\.[0-9]*$/\1/'`
+      minor=`echo $release |sed -e 's/[0-9]*\.\([0-9][0-9]*\)\(\..*\)*$/\1/'`
+      major=`echo $release |sed -e 's/\([0-9][0-9]*\)\..*$/\1/'`
       
       case $major in
        1) sysname=linux-1 ;;
@@ -95,9 +95,10 @@ if [ "$sysname" = "" ]; then
 fi
 
 echo "System Type: $sysname"
+
 if [ x$major != x ] && [ x$minor != x ]; then
   majversubst="-e /^##--majver--/,/^##--majver--/s/MajorVersion/$major/"
-  majversubst="-e /^##--minver--/,/^##--minver--/s/MinorVersion/$minor/"
+  minversubst="-e /^##--minver--/,/^##--minver--/s/MinorVersion/$minor/"
 fi
 
 for foo in . client server relay common; do