From a119386e306c14bb60de5e51bd8edadc0e9eb6c0 Mon Sep 17 00:00:00 2001 From: fuankg Date: Fri, 20 Nov 2009 10:05:03 +0000 Subject: fixed NetWare objects output directory naming. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.3.x@882476 13f79535-47bb-0310-9956-ffa450edef68 --- build/NWGNUenvironment.inc | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc index 9163a3c12..6e559436f 100644 --- a/build/NWGNUenvironment.inc +++ b/build/NWGNUenvironment.inc @@ -62,49 +62,47 @@ 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 +# debug - full debug 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 +ifdef OPTIMIZED +RELEASE = release endif -ifeq "$(RELEASE)" "noopt" -OBJDIR = Noopt +ifndef RELEASE +RELEASE = release endif -ifeq "$(RELEASE)" "optimized" -OBJDIR = Release -endif +OBJDIR = obj_$(RELEASE) # # Setup compiler information -- cgit v1.2.1