summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build/NWGNUenvironment.inc2
-rw-r--r--build/NWGNUmakefile2
-rw-r--r--srclib/pcre/NWGNUmakefile2
-rw-r--r--support/NWGNUab4
4 files changed, 5 insertions, 5 deletions
diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index a84b9e246d..027a8e37bf 100644
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -270,7 +270,7 @@ NWOS = $(AP_WORK)/os/netware
SERVER = $(AP_WORK)/server
SRC = $(AP_WORK)
APR = $(APR_WORK)
-APRUTIL = $(APR_WORK)/../apr-util
+APRUTIL = $(APU_WORK)
SUPMOD = $(AP_WORK)/support
PCRE = $(AP_WORK)/srclib/pcre
APRTEST = $(APR_WORK)/test
diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile
index 72dd90f659..a9205c2ec4 100644
--- a/build/NWGNUmakefile
+++ b/build/NWGNUmakefile
@@ -46,7 +46,7 @@ cc.opt : NWGNUmakefile $(AP_WORK)\build\NWGNUenvironment.inc $(AP_WORK)\build\NW
@echo -I..\modules\aaa >> $@
@echo -I..\os\netware >> $@
@echo -I..\server\mpm\netware >> $@
- @echo -I$(APR_WORK)\include >> $@
+ @echo -I$(APR)\include >> $@
@echo -I$(APRUTIL)\include >> $@
@echo -ir $(NOVELLLIBC) >> $@
diff --git a/srclib/pcre/NWGNUmakefile b/srclib/pcre/NWGNUmakefile
index e87a5effe7..a40897c67c 100644
--- a/srclib/pcre/NWGNUmakefile
+++ b/srclib/pcre/NWGNUmakefile
@@ -37,7 +37,7 @@ $(PCRE)/%.h: $(subst /,\,$(PCRE))\%.hw
#
XINCDIRS += \
$(AP_WORK)/os/netware \
- $(APR_WORK)/include/arch/netware \
+ $(APR)/include/arch/netware \
$(EOLIST)
#
diff --git a/support/NWGNUab b/support/NWGNUab
index d7cd3211ee..9f94eebde8 100644
--- a/support/NWGNUab
+++ b/support/NWGNUab
@@ -19,9 +19,9 @@ XINCDIRS += \
$(NWOS) \
$(AP_WORK)/include \
$(APR)/include \
- $(APRUTIL)/../apr-util/include \
+ $(APRUTIL)/include \
$(APR)/misc/netware \
- $(APR_WORK) \
+ $(APR) \
$(EOLIST)
#