From: Guenter Knauf <fuankg@apache.org>
Date: Sat, 11 Jul 2009 15:37:59 +0000 (+0000)
Subject: improved NetWare version script; fixed defaults;
X-Git-Tag: 2.2.12~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a600d46c5b92cef6fe424eb4d2d48dfabbafc531;p=thirdparty%2Fapache%2Fhttpd.git

improved NetWare version script; fixed defaults;
avoid to create version include with clean target.


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

diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc
index 3169f9c8262..2c04623d85e 100644
--- a/build/NWGNUtail.inc
+++ b/build/NWGNUtail.inc
@@ -58,7 +58,7 @@ $(NLM_NAME)_LINKOPT_DEPENDS	= \
 				$(EOLIST)
 
 ifeq "$(words $(strip $(TARGET_lib)))" "1"
-LIB_NAME					= $(basename $(notdir $(TARGET_lib)))
+LIB_NAME			= $(basename $(notdir $(TARGET_lib)))
 $(LIB_NAME)_LIBLST_DEPENDS	= \
 				$(FILES_lib_objs) \
 				$(AP_WORK)\build\NWGNUenvironment.inc \
@@ -82,17 +82,20 @@ endif
 # Generic compiler rules
 #
 
-$(AP_WORK)\build\NWGNUversion.inc : $(AP_WORK)\include\ap_release.h $(AP_WORK)\build\nw_ver.awk
+ifneq ($(MAKECMDGOALS),clean)
+$(AP_WORK)\build\NWGNUversion.inc : $(AP_WORK)\build\nw_ver.awk $(AP_WORK)\include\ap_release.h
 	@echo Generating $(subst /,\,$@)
-	$(AWK) -f $(AP_WORK)\build\nw_ver.awk $(AP_WORK)\include\ap_release.h > $(AP_WORK)\build\NWGNUversion.inc
+	$(AWK) -f $^ > $@
 
 -include $(AP_WORK)\build\NWGNUversion.inc
 
 ifneq "$(strip $(VERSION_STR))" ""
 VERSION_INC = $(AP_WORK)\build\NWGNUversion.inc
 else
-VERSION		= 2,0,0
-VERSION_STR	= 2.0.0
+VERSION		= 2,2,0
+VERSION_STR	= 2.2.0
+VERSION_MAJMIN	= 22
+endif
 endif
 
 
diff --git a/build/nw_ver.awk b/build/nw_ver.awk
index ea6981914b3..385cd658cd6 100644
--- a/build/nw_ver.awk
+++ b/build/nw_ver.awk
@@ -14,11 +14,15 @@
 # limitations under the License.
 
 BEGIN {
-
-  # fetch Apache version numbers from input file and writes them to STDOUT
+  # fetch Apache version numbers from input file and write them to STDOUT
 
   while ((getline < ARGV[1]) > 0) {
-    if (match ($0, /^#define AP_SERVER_MAJORVERSION_NUMBER /)) {
+    if (match ($0, /^#define AP_SERVER_COPYRIGHT \\/)) {
+      if (((getline < ARGV[1]) > 0) && (split($0, c, "\"") == 3)) {
+        copyright_str = c[2];
+      }
+    }
+    else if (match ($0, /^#define AP_SERVER_MAJORVERSION_NUMBER /)) {
       ver_major = $3;
     }
     else if (match ($0, /^#define AP_SERVER_MINORVERSION_NUMBER /)) {
@@ -36,6 +40,8 @@ BEGIN {
 
   print "VERSION = " ver_nlm "";
   print "VERSION_STR = " ver_str "";
+  print "VERSION_MAJMIN = " ver_major ver_minor "";
+  print "COPYRIGHT_STR = " copyright_str "";
 
 }