Commit 6a8569a3 authored by Bradley Nicholes's avatar Bradley Nicholes
Browse files

Allow APR-UTIL to exist and build outside of the httpd/srclib file structure 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@109566 13f79535-47bb-0310-9956-ffa450edef68
parent d8f3229c

build/NWGNUenvironment.inc

+1 −1
Original line number Diff line number Diff line
@@ -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

build/NWGNUmakefile

+1 −1
Original line number Diff line number Diff line
@@ -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) >> $@

srclib/pcre/NWGNUmakefile

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ $(PCRE)/%.h: $(subst /,\,$(PCRE))\%.hw 
#

XINCDIRS	+= \

			$(AP_WORK)/os/netware \

			$(APR_WORK)/include/arch/netware \

			$(APR)/include/arch/netware \

			$(EOLIST)



#

support/NWGNUab

+2 −2
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ XINCDIRS += \ 
			$(NWOS) \

			$(AP_WORK)/include \

			$(APR)/include \

			$(APRUTIL)/../apr-util/include \

			$(APRUTIL)/include \

			$(APR)/misc/netware \

			$(APR_WORK) \

			$(APR) \

			$(EOLIST)



#