summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorGuenter Knauf <fuankg@apache.org>2011-03-20 06:34:19 +0000
committerGuenter Knauf <fuankg@apache.org>2011-03-20 06:34:19 +0000
commitec1c2b4119345500c7dbb408ec74d1dcf1b3d296 (patch)
treeef44bf67ef0f427a62d3ea40a5d7c841c377d444 /build
parent8489ec0d04b762b62682b6b45491aa94f29cf576 (diff)
downloadhttpd-ec1c2b4119345500c7dbb408ec74d1dcf1b3d296.tar.gz
Fixed NetWare build install dir namings.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1083371 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build')
-rw-r--r--build/NWGNUenvironment.inc13
1 files changed, 9 insertions, 4 deletions
diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index bb62832944..728c427b16 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 \