From: Guenter Knauf <fuankg@apache.org>
Date: Fri, 20 Nov 2009 10:17:02 +0000 (+0000)
Subject: fixed NetWare objects output directory naming.
X-Git-Tag: 2.2.15~151
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3c04ed1efff887525672a9ea5ac28bd5c26a8a3;p=thirdparty%2Fapache%2Fhttpd.git

fixed NetWare objects output directory naming.


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

diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index 110421dbccd..9e6a5d83cb2 100644
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -68,48 +68,46 @@ endif
 # Set the Release type that you want to build, possible values are:
 #
 #  debug	- full debug switches are set
-#  noopt	- normal switches are set (default)
-#  optimized	- optimization switches are set
+#  noopt	- normal switches are set
+#  release	- optimization switches are set (default)
 
 ifdef reltype
-RELEASE=$(reltype)
-endif
+RELEASE = $(reltype)
+endif    
 
 ifdef RELTYPE
-RELEASE=$(RELTYPE)
+RELEASE = $(RELTYPE)
 endif
 
 ifdef debug
-RELEASE=debug
+RELEASE = debug
 endif
 
 ifdef DEBUG
-RELEASE=debug
+RELEASE = debug
 endif
 
-ifdef optimized
-RELEASE=optimized
+ifdef noopt
+RELEASE = noopt
 endif
 
-ifdef OPTIMIZED
-RELEASE=optimized
+ifdef NOOPT
+RELEASE = noopt
 endif
 
-ifndef RELEASE
-RELEASE = optimized
+ifdef optimized
+RELEASE = release
 endif
 
-ifeq "$(RELEASE)" "debug"
-OBJDIR = Debug.o
+ifdef OPTIMIZED
+RELEASE = release
 endif
 
-ifeq "$(RELEASE)" "noopt"
-OBJDIR = Noopt
+ifndef RELEASE
+RELEASE = release
 endif
 
-ifeq "$(RELEASE)" "optimized"
-OBJDIR = Release.o
-endif
+OBJDIR = obj_$(RELEASE)
 
 #
 # Setup compiler information
@@ -191,7 +189,7 @@ CFLAGS += -g -O0
 endif
 
 # -O4,p                 level 4 optimizations, optimize for speed
-ifeq "$(RELEASE)" "optimized"
+ifeq "$(RELEASE)" "release"
 CFLAGS += -O4,p
 endif