Fix up the NetWare AWK script that extracts the version number so that it matches...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@328652 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build/nw_ver.awk b/build/nw_ver.awk
index 00e0ef0b9dc565e90cc3125b69e88ce436d30f08..ba6d298f4c83d7e468b0322552d51250a65174ce 100644 (file)
--- a/build/nw_ver.awk
+++ b/build/nw_ver.awk
@@ -18,21 +18,21 @@ BEGIN {
   # fetch Apache version numbers from input file and writes them to STDOUT
 
   while ((getline < ARGV[1]) > 0) {
-    if (match ($0, /^#define AP_SERVER_MAJORVERSION "[^"]+"/)) {
-      ver_major = substr($3, 2, length($3) - 2);
+    if (match ($0, /^#define AP_SERVER_MAJORVERSION_NUMBER /)) {
+      ver_major = $3;
     }
-    else if (match ($0, /^#define AP_SERVER_MINORVERSION "[^"]+"/)) {
-      ver_minor = substr($3, 2, length($3) - 2);
+    else if (match ($0, /^#define AP_SERVER_MINORVERSION_NUMBER /)) {
+      ver_minor = $3;
     }
-    else if (match ($0, /^#define AP_SERVER_PATCHLEVEL/)) {
-      ver_str_patch = substr($3, 2, length($3) - 2);
-      if (match (ver_str_patch, /[0-9][0-9]*/)) {
-         ver_patch = substr(ver_str_patch, RSTART, RLENGTH); 
-      }
+    else if (match ($0, /^#define AP_SERVER_PATCHLEVEL_NUMBER/)) {
+      ver_patch = $3;
+    }
+    else if (match ($0, /^#define AP_SERVER_ADD_STRING /)) {
+        ver_str_release = substr($3, 2, length($3) - 2);
     }
   }
   ver = ver_major "," ver_minor "," ver_patch;
-  ver_str = ver_major "." ver_minor "." ver_str_patch;
+  ver_str = ver_major "." ver_minor "." ver_patch ver_str_release;
 
   print "VERSION = " ver "";
   print "VERSION_STR = " ver_str "";