summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorBradley Nicholes <bnicholes@apache.org>2002-12-18 16:07:08 +0000
committerBradley Nicholes <bnicholes@apache.org>2002-12-18 16:07:08 +0000
commit334a93403103a2a85106a328c6e74bfb1a0c96f9 (patch)
tree728a2b3b322517ee557c3e7b2552b75eb52f0bcf /build
parent74e1cc88118e178af5f505c2ebb10787b98252cd (diff)
downloadhttpd-334a93403103a2a85106a328c6e74bfb1a0c96f9.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/branches/APACHE_2_0_BRANCH@98010 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build')
-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