fixed version string for dev builds.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@563728 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build/nw_ver.awk b/build/nw_ver.awk
index f908fe34af8f6091999ae436b4d07eea265cdffe..ea6981914b3326389e47931027b56a4a5b4c5c1b 100644 (file)
--- a/build/nw_ver.awk
+++ b/build/nw_ver.awk
@@ -27,14 +27,16 @@ BEGIN {
     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);
+    else if (match ($0, /^#define AP_SERVER_DEVBUILD_BOOLEAN/)) {
+      ver_devbuild = $3;
     }
   }
-  ver = ver_major "," ver_minor "," ver_patch;
-  ver_str = ver_major "." ver_minor "." ver_patch ver_str_release;
+  ver_nlm = ver_major "," ver_minor "," ver_patch;
+  ver_str = ver_major "." ver_minor "." ver_patch (ver_devbuild ? "-dev" : "");
 
-  print "VERSION = " ver "";
+  print "VERSION = " ver_nlm "";
   print "VERSION_STR = " ver_str "";
 
 }
+
+