From: Guenter Knauf <fuankg@apache.org>
Date: Mon, 6 Jul 2009 21:58:08 +0000 (+0000)
Subject: some more NetWare build tweaks.
X-Git-Tag: 2.3.3~463
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c195bdb8caaa866f6b991abef341a26678d0dc5b;p=thirdparty%2Fapache%2Fhttpd.git

some more NetWare build tweaks.


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

diff --git a/build/NWGNUtail.inc b/build/NWGNUtail.inc
index 6dd89ba0517..8f8943f8416 100644
--- a/build/NWGNUtail.inc
+++ b/build/NWGNUtail.inc
@@ -87,16 +87,16 @@ $(AP_WORK)/build/NWGNUversion.inc : $(AP_WORK)/build/nw_ver.awk $(AP_WORK)/inclu
 	@echo Generating $(subst /,\,$@)
 	$(AWK) -f $^ > $@
 
--include $(AP_WORK)\build\NWGNUversion.inc
+-include $(AP_WORK)/build/NWGNUversion.inc
 
 ifneq "$(strip $(VERSION_STR))" ""
-VERSION_INC = $(AP_WORK)\build\NWGNUversion.inc
+VERSION_INC = $(AP_WORK)/build/NWGNUversion.inc
 else
 VERSION		= 2,3,0
 VERSION_STR	= 2.3.0
-endif
 VERSION_MAJMIN	= 23
 endif
+endif
 
 
 ifeq "$(words $(strip $(TARGET_nlm)))" "1"
diff --git a/build/nw_ver.awk b/build/nw_ver.awk
index 00e0276c8f1..385cd658cd6 100644
--- a/build/nw_ver.awk
+++ b/build/nw_ver.awk
@@ -14,8 +14,7 @@
 # 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_COPYRIGHT \\/)) {
@@ -41,6 +40,7 @@ BEGIN {
 
   print "VERSION = " ver_nlm "";
   print "VERSION_STR = " ver_str "";
+  print "VERSION_MAJMIN = " ver_major ver_minor "";
   print "COPYRIGHT_STR = " copyright_str "";
 
 }