respect CVS builds in version string.

1 files changed, 26 insertions, 2 deletions

diff --git a/packages/NetWare/get_ver.awk b/packages/NetWare/get_ver.awk
index ca434f358..3a941764c 100644
--- a/packages/NetWare/get_ver.awk
+++ b/packages/NetWare/get_ver.awk
@@ -1,7 +1,32 @@
+# ***************************************************************************
+# *                                  _   _ ____  _
+# *  Project                     ___| | | |  _ \| |
+# *                             / __| | | | |_) | |
+# *                            | (__| |_| |  _ <| |___
+# *                             \___|\___/|_| \_\_____|
+# *
+# * Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.
+# *
+# * This software is licensed as described in the file COPYING, which
+# * you should have received as part of this distribution. The terms
+# * are also available at http://curl.haxx.se/docs/copyright.html.
+# *
+# * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+# * copies of the Software, and permit persons to whom the Software is
+# * furnished to do so, under the terms of the COPYING file.
+# *
+# * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+# * KIND, either express or implied.
+# *
+# * $Id$
+# ***************************************************************************
 # fetch libcurl version number from input file and write them to STDOUT
 BEGIN {
   while ((getline < ARGV[1]) > 0) {
-    if (match ($0, /^#define LIBCURL_VERSION_MAJOR [^"]+/)) {
+    if (match ($0, /^#define LIBCURL_VERSION "[^"]+"/)) {
+      libcurl_ver_str = substr($3, 2, length($3)-2);
+    }
+    else if (match ($0, /^#define LIBCURL_VERSION_MAJOR [^"]+/)) {
       libcurl_ver_major = substr($3, 1, length($3));
     }
     else if (match ($0, /^#define LIBCURL_VERSION_MINOR [^"]+/)) {
@@ -12,7 +37,6 @@ BEGIN {
     }
   }
   libcurl_ver = libcurl_ver_major "," libcurl_ver_minor "," libcurl_ver_patch;
-  libcurl_ver_str = libcurl_ver_major "." libcurl_ver_minor "." libcurl_ver_patch;
 
   print "LIBCURL_VERSION = " libcurl_ver "";
   print "LIBCURL_VERSION_STR = " libcurl_ver_str "";