From: Guenter Knauf <fuankg@apache.org>
Date: Sun, 20 Mar 2011 06:34:19 +0000 (+0000)
Subject: Fixed NetWare build install dir namings.
X-Git-Tag: 2.3.12~202
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec1c2b4119345500c7dbb408ec74d1dcf1b3d296;p=thirdparty%2Fapache%2Fhttpd.git

Fixed NetWare build install dir namings.


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

diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index bb62832944a..728c427b16e 100644
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -293,9 +293,14 @@ INSTALL = $(AP_WORK)/Dist
 INSTDIRS = $(INSTALL)
 endif
 
+ifeq ($(MAKECMDGOALS),installdev)
 ifndef BASEDIR
-BASEDIR = Apache23
-export BASEDIR
+export BASEDIR = apache_$(VERSION_STR)-sdk
+endif
+else
+ifndef BASEDIR
+export BASEDIR = Apache$(VERSION_MAJMIN)
+endif
 endif
 
 # Add support for building IPV6 alongside
@@ -317,9 +322,9 @@ endif
 
 endif
 
-INSTALLBASE := $(INSTALL)/$(BASEDIR)
+INSTALLBASE = $(INSTALL)/$(BASEDIR)
 
-INSTDEVDIRS := \
+INSTDEVDIRS = \
 	$(INSTALL) \
 	$(INSTALLBASE) \
 	$(INSTALLBASE)/build \