]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Fixed NetWare build install dir namings.
authorGuenter Knauf <fuankg@apache.org>
Sun, 20 Mar 2011 06:34:19 +0000 (06:34 +0000)
committerGuenter Knauf <fuankg@apache.org>
Sun, 20 Mar 2011 06:34:19 +0000 (06:34 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1083371 13f79535-47bb-0310-9956-ffa450edef68

build/NWGNUenvironment.inc

index bb62832944add46d4fb39c54c1db199dc56e1136..728c427b16ef469b516d7cf0239dc136034dcf40 100644 (file)
@@ -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 \