summaryrefslogtreecommitdiff
path: root/build/NWGNUenvironment.inc
diff options
context:
space:
mode:
authorBradley Nicholes <bnicholes@apache.org>2002-12-18 16:06:40 +0000
committerBradley Nicholes <bnicholes@apache.org>2002-12-18 16:06:40 +0000
commita3845ddbdf75841833f7ea42bfec86f7bd54b6b4 (patch)
treefa22301e11c484e02c548efd11915431c2452a91 /build/NWGNUenvironment.inc
parent03b42d51da0551c0285843f74711b1523b3c9c39 (diff)
downloadhttpd-a3845ddbdf75841833f7ea42bfec86f7bd54b6b4.tar.gz
Makefile fix for building IPV6. This stops the makefile from recursively creating
IPV6 directories git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98009 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build/NWGNUenvironment.inc')
-rw-r--r--build/NWGNUenvironment.inc9
1 files changed, 7 insertions, 2 deletions
diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index 8cbea7b350..a9234ff9d7 100644
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -198,11 +198,16 @@ ifneq "$(IPV6)" ""
DEFINES += -DNW_BUILD_IPV6
INCDIRS := $(NOVELLLIBC)\include\winsock\IPV6;$(INCDIRS)
-ifneq "$(IPV6)" "SET"
+ifneq "$(findstring IPV6,$(OBJDIR))" "IPV6"
OBJDIR := $(OBJDIR)_IPV6
+endif
+
+ifneq "$(findstring IPV6,$(INSTALL))" "IPV6"
INSTALL := $(INSTALL)_IPV6
+endif
+
+ifneq "$(findstring IPV6,$(INSTDIRS))" "IPV6"
INSTDIRS := $(INSTDIRS)_IPV6
-IPV6=SET
endif
endif