Author: bnicholes Date: Thu Dec 2 13:55:19 2004 New Revision: 109561 URL: http://svn.apache.org/viewcvs?view=rev&rev=109561 Log: Allow APR-UTIL to exist and build outside of the httpd/srclib file structure Modified: apr/apr/trunk/NWGNUmakefile apr/apr/trunk/build/NWGNUenvironment.inc apr/apr/trunk/build/NWGNUmakefile apr/apr/trunk/test/NWGNUmakefile apr/apr/trunk/test/nwgnuaprtest apr/apr/trunk/test/nwgnuglobalmutexchild apr/apr/trunk/test/nwgnumod_test apr/apr/trunk/test/nwgnuproc_child apr/apr/trunk/test/nwgnureadchild apr/apr/trunk/test/nwgnusockchild apr/apr/trunk/test/nwgnutestatmc apr/apr/trunk/test/nwgnutryread
Modified: apr/apr/trunk/NWGNUmakefile Url: http://svn.apache.org/viewcvs/apr/apr/trunk/NWGNUmakefile?view=diff&rev=109561&p1=apr/apr/trunk/NWGNUmakefile&r1=109560&p2=apr/apr/trunk/NWGNUmakefile&r2=109561 ============================================================================== --- apr/apr/trunk/NWGNUmakefile (original) +++ apr/apr/trunk/NWGNUmakefile Thu Dec 2 13:55:19 2004 @@ -4,7 +4,7 @@ SUBDIRS = \ build \ - ..\apr-util \ + $(APU_WORK) \ $(EOLIST) # @@ -26,11 +26,11 @@ # INCDIRS # XINCDIRS += \ - $(APR_WORK)/include \ - $(APR_WORK)/include/arch/NetWare \ - $(APR_WORK)/include/arch/unix \ - $(APR_WORK)/memory/unix \ - $(APR_WORK)/random/unix \ + $(APR)/include \ + $(APR)/include/arch/NetWare \ + $(APR)/include/arch/unix \ + $(APR)/memory/unix \ + $(APR)/random/unix \ $(APRUTIL)/xml \ $(EOLIST) Modified: apr/apr/trunk/build/NWGNUenvironment.inc Url: http://svn.apache.org/viewcvs/apr/apr/trunk/build/NWGNUenvironment.inc?view=diff&rev=109561&p1=apr/apr/trunk/build/NWGNUenvironment.inc&r1=109560&p2=apr/apr/trunk/build/NWGNUenvironment.inc&r2=109561 ============================================================================== --- apr/apr/trunk/build/NWGNUenvironment.inc (original) +++ apr/apr/trunk/build/NWGNUenvironment.inc Thu Dec 2 13:55:19 2004 @@ -264,7 +264,7 @@ APR = $(APR_WORK) APRTEST = $(APR_WORK)/test -APRUTIL = $(APR_WORK)/../apr-util +APRUTIL = $(APU_WORK) XML = $(APRUTIL)/xml # Modified: apr/apr/trunk/build/NWGNUmakefile Url: http://svn.apache.org/viewcvs/apr/apr/trunk/build/NWGNUmakefile?view=diff&rev=109561&p1=apr/apr/trunk/build/NWGNUmakefile&r1=109560&p2=apr/apr/trunk/build/NWGNUmakefile&r2=109561 ============================================================================== --- apr/apr/trunk/build/NWGNUmakefile (original) +++ apr/apr/trunk/build/NWGNUmakefile Thu Dec 2 13:55:19 2004 @@ -43,10 +43,10 @@ @echo -nosyspath >> $@ @echo -w nocmdline >> $@ @echo -DNETWARE >> $@ - @echo -I..\include >> $@ - @echo -I..\include\arch\netware >> $@ - @echo -I..\include\arch\unix >> $@ - @echo -I..\..\apr-util\include >> $@ + @echo -I$(APR)\include >> $@ + @echo -I$(APR)\include\arch\netware >> $@ + @echo -I$(APR)\include\arch\unix >> $@ + @echo -I$(APRUTIL)\include >> $@ @echo -ir $(NOVELLLIBC) >> $@ ifneq "$(LDAPSDK)" "" @echo -ir $(LDAPSDK) >> $@ Modified: apr/apr/trunk/test/NWGNUmakefile Url: http://svn.apache.org/viewcvs/apr/apr/trunk/test/NWGNUmakefile?view=diff&rev=109561&p1=apr/apr/trunk/test/NWGNUmakefile&r1=109560&p2=apr/apr/trunk/test/NWGNUmakefile&r2=109561 ============================================================================== --- apr/apr/trunk/test/NWGNUmakefile (original) +++ apr/apr/trunk/test/NWGNUmakefile Thu Dec 2 13:55:19 2004 @@ -25,8 +25,8 @@ # INCDIRS # XINCDIRS += \ - $(APR_WORK)/include \ - $(APR_WORK)/include/arch/NetWare \ + $(APR)/include \ + $(APR)/include/arch/NetWare \ $(EOLIST) # Modified: apr/apr/trunk/test/nwgnuaprtest Url: http://svn.apache.org/viewcvs/apr/apr/trunk/test/nwgnuaprtest?view=diff&rev=109561&p1=apr/apr/trunk/test/nwgnuaprtest&r1=109560&p2=apr/apr/trunk/test/nwgnuaprtest&r2=109561 ============================================================================== --- apr/apr/trunk/test/nwgnuaprtest (original) +++ apr/apr/trunk/test/nwgnuaprtest Thu Dec 2 13:55:19 2004 @@ -16,8 +16,8 @@ # INCDIRS # XINCDIRS += \ - $(APR_WORK)/include \ - $(APR_WORK)/include/arch/NetWare \ + $(APR)/include \ + $(APR)/include/arch/NetWare \ $(EOLIST) # Modified: apr/apr/trunk/test/nwgnuglobalmutexchild Url: http://svn.apache.org/viewcvs/apr/apr/trunk/test/nwgnuglobalmutexchild?view=diff&rev=109561&p1=apr/apr/trunk/test/nwgnuglobalmutexchild&r1=109560&p2=apr/apr/trunk/test/nwgnuglobalmutexchild&r2=109561 ============================================================================== --- apr/apr/trunk/test/nwgnuglobalmutexchild (original) +++ apr/apr/trunk/test/nwgnuglobalmutexchild Thu Dec 2 13:55:19 2004 @@ -16,8 +16,8 @@ # INCDIRS # XINCDIRS += \ - $(APR_WORK)/include \ - $(APR_WORK)/include/arch/NetWare \ + $(APR)/include \ + $(APR)/include/arch/NetWare \ $(EOLIST) # Modified: apr/apr/trunk/test/nwgnumod_test Url: http://svn.apache.org/viewcvs/apr/apr/trunk/test/nwgnumod_test?view=diff&rev=109561&p1=apr/apr/trunk/test/nwgnumod_test&r1=109560&p2=apr/apr/trunk/test/nwgnumod_test&r2=109561 ============================================================================== --- apr/apr/trunk/test/nwgnumod_test (original) +++ apr/apr/trunk/test/nwgnumod_test Thu Dec 2 13:55:19 2004 @@ -16,8 +16,8 @@ # INCDIRS # XINCDIRS += \ - $(APR_WORK)/include \ - $(APR_WORK)/include/arch/NetWare \ + $(APR)/include \ + $(APR)/include/arch/NetWare \ $(EOLIST) # Modified: apr/apr/trunk/test/nwgnuproc_child Url: http://svn.apache.org/viewcvs/apr/apr/trunk/test/nwgnuproc_child?view=diff&rev=109561&p1=apr/apr/trunk/test/nwgnuproc_child&r1=109560&p2=apr/apr/trunk/test/nwgnuproc_child&r2=109561 ============================================================================== --- apr/apr/trunk/test/nwgnuproc_child (original) +++ apr/apr/trunk/test/nwgnuproc_child Thu Dec 2 13:55:19 2004 @@ -16,8 +16,8 @@ # INCDIRS # XINCDIRS += \ - $(APR_WORK)/include \ - $(APR_WORK)/include/arch/NetWare \ + $(APR)/include \ + $(APR)/include/arch/NetWare \ $(EOLIST) # Modified: apr/apr/trunk/test/nwgnureadchild Url: http://svn.apache.org/viewcvs/apr/apr/trunk/test/nwgnureadchild?view=diff&rev=109561&p1=apr/apr/trunk/test/nwgnureadchild&r1=109560&p2=apr/apr/trunk/test/nwgnureadchild&r2=109561 ============================================================================== --- apr/apr/trunk/test/nwgnureadchild (original) +++ apr/apr/trunk/test/nwgnureadchild Thu Dec 2 13:55:19 2004 @@ -16,8 +16,8 @@ # INCDIRS # XINCDIRS += \ - $(APR_WORK)/include \ - $(APR_WORK)/include/arch/NetWare \ + $(APR)/include \ + $(APR)/include/arch/NetWare \ $(EOLIST) # Modified: apr/apr/trunk/test/nwgnusockchild Url: http://svn.apache.org/viewcvs/apr/apr/trunk/test/nwgnusockchild?view=diff&rev=109561&p1=apr/apr/trunk/test/nwgnusockchild&r1=109560&p2=apr/apr/trunk/test/nwgnusockchild&r2=109561 ============================================================================== --- apr/apr/trunk/test/nwgnusockchild (original) +++ apr/apr/trunk/test/nwgnusockchild Thu Dec 2 13:55:19 2004 @@ -16,8 +16,8 @@ # INCDIRS # XINCDIRS += \ - $(APR_WORK)/include \ - $(APR_WORK)/include/arch/NetWare \ + $(APR)/include \ + $(APR)/include/arch/NetWare \ $(EOLIST) # Modified: apr/apr/trunk/test/nwgnutestatmc Url: http://svn.apache.org/viewcvs/apr/apr/trunk/test/nwgnutestatmc?view=diff&rev=109561&p1=apr/apr/trunk/test/nwgnutestatmc&r1=109560&p2=apr/apr/trunk/test/nwgnutestatmc&r2=109561 ============================================================================== --- apr/apr/trunk/test/nwgnutestatmc (original) +++ apr/apr/trunk/test/nwgnutestatmc Thu Dec 2 13:55:19 2004 @@ -16,8 +16,8 @@ # INCDIRS # XINCDIRS += \ - $(APR_WORK)/include \ - $(APR_WORK)/include/arch/NetWare \ + $(APR)/include \ + $(APR)/include/arch/NetWare \ $(EOLIST) # Modified: apr/apr/trunk/test/nwgnutryread Url: http://svn.apache.org/viewcvs/apr/apr/trunk/test/nwgnutryread?view=diff&rev=109561&p1=apr/apr/trunk/test/nwgnutryread&r1=109560&p2=apr/apr/trunk/test/nwgnutryread&r2=109561 ============================================================================== --- apr/apr/trunk/test/nwgnutryread (original) +++ apr/apr/trunk/test/nwgnutryread Thu Dec 2 13:55:19 2004 @@ -16,8 +16,8 @@ # INCDIRS # XINCDIRS += \ - $(APR_WORK)/include \ - $(APR_WORK)/include/arch/NetWare \ + $(APR)/include \ + $(APR)/include/arch/NetWare \ $(EOLIST) #
