diff options
| author | Bradley Nicholes <bnicholes@apache.org> | 2004-12-07 22:26:59 +0000 |
|---|---|---|
| committer | Bradley Nicholes <bnicholes@apache.org> | 2004-12-07 22:26:59 +0000 |
| commit | 210b6e47a65f27728f1b587d0b7277e3e1ae3f48 (patch) | |
| tree | 133034810d3e13512e8758786e70482ae89489ee | |
| parent | 56f7e721b72536230acc7bce1f40c6b3325e7a68 (diff) | |
| download | apr-210b6e47a65f27728f1b587d0b7277e3e1ae3f48.tar.gz | |
Allow APR-UTIL to exist and build outside of the httpd/srclib file structure
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.0.x@111154 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | NWGNUmakefile | 2 | ||||
| -rw-r--r-- | build/NWGNUenvironment.inc | 2 | ||||
| -rw-r--r-- | build/NWGNUmakefile | 8 | ||||
| -rw-r--r-- | test/NWGNUmakefile | 4 | ||||
| -rw-r--r-- | test/nwgnuaprtest | 4 | ||||
| -rw-r--r-- | test/nwgnuglobalmutexchild | 4 | ||||
| -rw-r--r-- | test/nwgnumod_test | 4 | ||||
| -rw-r--r-- | test/nwgnuproc_child | 4 | ||||
| -rw-r--r-- | test/nwgnureadchild | 4 | ||||
| -rw-r--r-- | test/nwgnusockchild | 4 | ||||
| -rw-r--r-- | test/nwgnutestatmc | 4 | ||||
| -rw-r--r-- | test/nwgnutryread | 4 |
12 files changed, 24 insertions, 24 deletions
diff --git a/NWGNUmakefile b/NWGNUmakefile index b977bb0d6..6f2782108 100644 --- a/NWGNUmakefile +++ b/NWGNUmakefile @@ -4,7 +4,7 @@ SUBDIRS = \ build \ - ..\apr-util \ + $(APU_WORK) \ $(EOLIST) # diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc index b3aff53b1..c6b860afb 100644 --- a/build/NWGNUenvironment.inc +++ b/build/NWGNUenvironment.inc @@ -264,7 +264,7 @@ endif APR = $(APR_WORK) APRTEST = $(APR_WORK)/test -APRUTIL = $(APR_WORK)/../apr-util +APRUTIL = $(APU_WORK) XML = $(APRUTIL)/xml # diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile index eb9d4c6ae..6a003ab65 100644 --- a/build/NWGNUmakefile +++ b/build/NWGNUmakefile @@ -43,10 +43,10 @@ $(NLM_NAME)_cc.opt : NWGNUmakefile $(APR_WORK)\build\NWGNUenvironment.inc $(APR_ @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) >> $@ diff --git a/test/NWGNUmakefile b/test/NWGNUmakefile index 869a7618e..c5bf24c11 100644 --- a/test/NWGNUmakefile +++ b/test/NWGNUmakefile @@ -25,8 +25,8 @@ include $(APR_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(APR_WORK)/include \ - $(APR_WORK)/include/arch/NetWare \ + $(APR)/include \ + $(APR)/include/arch/NetWare \ $(EOLIST) # diff --git a/test/nwgnuaprtest b/test/nwgnuaprtest index 11f7e3af6..22b24b084 100644 --- a/test/nwgnuaprtest +++ b/test/nwgnuaprtest @@ -16,8 +16,8 @@ endif # INCDIRS # XINCDIRS += \ - $(APR_WORK)/include \ - $(APR_WORK)/include/arch/NetWare \ + $(APR)/include \ + $(APR)/include/arch/NetWare \ $(EOLIST) # diff --git a/test/nwgnuglobalmutexchild b/test/nwgnuglobalmutexchild index 8979d27a9..3d683bab5 100644 --- a/test/nwgnuglobalmutexchild +++ b/test/nwgnuglobalmutexchild @@ -16,8 +16,8 @@ endif # INCDIRS # XINCDIRS += \ - $(APR_WORK)/include \ - $(APR_WORK)/include/arch/NetWare \ + $(APR)/include \ + $(APR)/include/arch/NetWare \ $(EOLIST) # diff --git a/test/nwgnumod_test b/test/nwgnumod_test index 1510ccb52..3dfa6df45 100644 --- a/test/nwgnumod_test +++ b/test/nwgnumod_test @@ -16,8 +16,8 @@ endif # INCDIRS # XINCDIRS += \ - $(APR_WORK)/include \ - $(APR_WORK)/include/arch/NetWare \ + $(APR)/include \ + $(APR)/include/arch/NetWare \ $(EOLIST) # diff --git a/test/nwgnuproc_child b/test/nwgnuproc_child index 51cffff21..49c1fab6f 100644 --- a/test/nwgnuproc_child +++ b/test/nwgnuproc_child @@ -16,8 +16,8 @@ endif # INCDIRS # XINCDIRS += \ - $(APR_WORK)/include \ - $(APR_WORK)/include/arch/NetWare \ + $(APR)/include \ + $(APR)/include/arch/NetWare \ $(EOLIST) # diff --git a/test/nwgnureadchild b/test/nwgnureadchild index e539b789b..0fd984da1 100644 --- a/test/nwgnureadchild +++ b/test/nwgnureadchild @@ -16,8 +16,8 @@ endif # INCDIRS # XINCDIRS += \ - $(APR_WORK)/include \ - $(APR_WORK)/include/arch/NetWare \ + $(APR)/include \ + $(APR)/include/arch/NetWare \ $(EOLIST) # diff --git a/test/nwgnusockchild b/test/nwgnusockchild index f49cfc5e5..16dac9e42 100644 --- a/test/nwgnusockchild +++ b/test/nwgnusockchild @@ -16,8 +16,8 @@ endif # INCDIRS # XINCDIRS += \ - $(APR_WORK)/include \ - $(APR_WORK)/include/arch/NetWare \ + $(APR)/include \ + $(APR)/include/arch/NetWare \ $(EOLIST) # diff --git a/test/nwgnutestatmc b/test/nwgnutestatmc index afe1aaf21..dbbe4250b 100644 --- a/test/nwgnutestatmc +++ b/test/nwgnutestatmc @@ -16,8 +16,8 @@ endif # INCDIRS # XINCDIRS += \ - $(APR_WORK)/include \ - $(APR_WORK)/include/arch/NetWare \ + $(APR)/include \ + $(APR)/include/arch/NetWare \ $(EOLIST) # diff --git a/test/nwgnutryread b/test/nwgnutryread index 40ceb595b..cc4aee020 100644 --- a/test/nwgnutryread +++ b/test/nwgnutryread @@ -16,8 +16,8 @@ endif # INCDIRS # XINCDIRS += \ - $(APR_WORK)/include \ - $(APR_WORK)/include/arch/NetWare \ + $(APR)/include \ + $(APR)/include/arch/NetWare \ $(EOLIST) # |