cvs commit: apr/build NWGNUenvironment.inc

[bnicholes]

bnicholes    2002/12/18 08:07:35

  Modified:    build    NWGNUenvironment.inc
  Log:
  Makefile fix for building IPV6.  This stops the makefile from recursively 
creating
  IPV6 directories
  
  Revision  Changes    Path
  1.7       +7 -2      apr/build/NWGNUenvironment.inc
  
  Index: NWGNUenvironment.inc
  ===================================================================
  RCS file: /home/cvs/apr/build/NWGNUenvironment.inc,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- NWGNUenvironment.inc      16 Oct 2002 23:53:03 -0000      1.6
  +++ NWGNUenvironment.inc      18 Dec 2002 16:07:35 -0000      1.7
  @@ -187,11 +187,16 @@
   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