NetWare build overhaul in order to compile on Linux.

Removed absolute paths to imp files.


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

modules/aaa/NWGNUaccesscompat

@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/aaa/NWGNUallowmethods

@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/aaa/NWGNUauthbasc

@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/aaa/NWGNUauthdigt

@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/aaa/NWGNUauthform

@@ -203,8 +203,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/aaa/NWGNUauthnano

@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/aaa/NWGNUauthndbd

@@ -202,8 +202,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/aaa/NWGNUauthndbm

@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/aaa/NWGNUauthnfil

@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/aaa/NWGNUauthnsocache

@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/aaa/NWGNUauthnzldap

@@ -216,10 +216,10 @@ FILES_nlm_Ximports = \
 	util_ldap_cache_getuserdn \
 	util_ldap_cache_compare \
 	util_ldap_cache_comparedn \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
-	@$(LDAPSDK)/imports/lldapsdk.imp \
+	@lldapsdk.imp \
 	$(EOLIST)
 
 #

modules/aaa/NWGNUauthzdbd

@@ -202,8 +202,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/aaa/NWGNUauthzdbm

@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/aaa/NWGNUauthzgrp

@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/aaa/NWGNUauthzusr

@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/cache/NWGNUcach_dsk

@@ -215,7 +215,7 @@ FILE_nlm_copyright =
 #
 FILES_nlm_Ximports = \
 	@libc.imp \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
 	@httpd.imp \
 	@mod_cache.imp \
 	$(EOLIST)

modules/cache/NWGNUmod_cach

@@ -217,7 +217,7 @@ FILE_nlm_copyright =
 #
 FILES_nlm_Ximports = \
 	@libc.imp \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
 	@httpd.imp \
 	@netware.imp \
 	$(EOLIST)

modules/cache/NWGNUsocachdbm

@@ -215,7 +215,7 @@ FILE_nlm_copyright =
 #
 FILES_nlm_Ximports = \
 	@libc.imp \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
 	@httpd.imp \
 	@mod_cache.imp \
 	$(EOLIST)

modules/cache/NWGNUsocachshmcb

@@ -215,7 +215,7 @@ FILE_nlm_copyright =
 #
 FILES_nlm_Ximports = \
 	@libc.imp \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
 	@httpd.imp \
 	@mod_cache.imp \
 	$(EOLIST)

modules/cluster/NWGNUmodheartbeat

@@ -210,8 +210,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/cluster/NWGNUmodheartmonitor

@@ -210,8 +210,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/database/NWGNUmakefile

@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/dav/fs/NWGNUmakefile

@@ -214,7 +214,7 @@ FILE_nlm_copyright =
 #
 FILES_nlm_Ximports = \
 	@libc.imp \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
 	@httpd.imp \
 	@../main/dav.imp \
 	$(EOLIST)

modules/dav/lock/NWGNUmakefile

@@ -211,7 +211,7 @@ FILE_nlm_copyright =
 #
 FILES_nlm_Ximports = \
 	@libc.imp \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
 	@httpd.imp \
 	@../main/dav.imp \
 	$(EOLIST)

modules/dav/main/NWGNUmakefile

@@ -220,7 +220,7 @@ FILE_nlm_copyright =
 #
 FILES_nlm_Ximports = \
 	@libc.imp \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
 	@httpd.imp \
 	$(EOLIST)
 

modules/debugging/NWGNUmodbucketeer

@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/debugging/NWGNUmoddumpio

@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/echo/NWGNUmakefile

@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/examples/NWGNUcase_flt

@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/examples/NWGNUcase_flt_in

@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/examples/NWGNUexample_hooks

@@ -210,8 +210,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/examples/NWGNUexample_ipc

@@ -210,8 +210,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/experimental/NWGNUnoloris

@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/filters/NWGNUcharsetl

@@ -210,8 +210,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/filters/NWGNUdeflate

@@ -228,8 +228,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/filters/NWGNUextfiltr

@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/filters/NWGNUmod_filter

@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/filters/NWGNUmod_request

@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/filters/NWGNUmodbuffer

@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/filters/NWGNUmodsed

@@ -212,8 +212,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/filters/NWGNUratelimit

@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/filters/NWGNUreflector

@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/filters/NWGNUreqtimeout

@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/filters/NWGNUsubstitute

@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/generators/NWGNUautoindex

@@ -202,8 +202,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/generators/NWGNUinfo

@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/generators/NWGNUmod_asis

@@ -202,8 +202,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/generators/NWGNUmod_cgi

@@ -203,8 +203,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/generators/NWGNUstatus

@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/ldap/NWGNUmakefile

@@ -214,11 +214,11 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
-	@$(LDAPSDK)/imports/lldapsdk.imp \
+	@lldapsdk.imp \
-	@$(LDAPSDK)/imports/lldapssl.imp \
+	@lldapssl.imp \
 	$(EOLIST)
 
 #

modules/loggers/NWGNUforensic

@@ -210,8 +210,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/loggers/NWGNUmodlogio

@@ -210,8 +210,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/lua/NWGNUmakefile

@@ -219,8 +219,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/mappers/NWGNUactions

@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/mappers/NWGNUimagemap

@@ -202,8 +202,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/mappers/NWGNUrewrite

@@ -203,8 +203,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/mappers/NWGNUspeling

@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/mappers/NWGNUuserdir

@@ -202,8 +202,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/mappers/NWGNUvhost

@@ -202,8 +202,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/metadata/NWGNUcernmeta

@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/metadata/NWGNUexpires

@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/metadata/NWGNUheaders

@@ -202,8 +202,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/metadata/NWGNUmimemagi

@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/metadata/NWGNUmodident

@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/metadata/NWGNUmodversion

@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/metadata/NWGNUremoteip

@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/metadata/NWGNUuniqueid

@@ -202,8 +202,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/metadata/NWGNUusertrk

@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/proxy/NWGNUproxy

@@ -206,8 +206,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/proxy/NWGNUproxyajp

@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@$(OBJDIR)/mod_proxy.imp \
 	@libc.imp \
 	$(EOLIST)

modules/proxy/NWGNUproxybalancer

@@ -205,8 +205,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@$(OBJDIR)/mod_proxy.imp \
 	@libc.imp \
 	$(EOLIST)

modules/proxy/NWGNUproxycon

@@ -204,8 +204,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@$(OBJDIR)/mod_proxy.imp \
 	@libc.imp \
 	$(EOLIST)

modules/proxy/NWGNUproxyfcgi

@@ -206,8 +206,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@$(OBJDIR)/mod_proxy.imp \
 	@libc.imp \
 	$(EOLIST)

modules/proxy/NWGNUproxyftp

@@ -205,8 +205,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@$(OBJDIR)/mod_proxy.imp \
 	@libc.imp \
 	$(EOLIST)

modules/proxy/NWGNUproxyhtp

@@ -205,8 +205,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@$(OBJDIR)/mod_proxy.imp \
 	@libc.imp \
 	$(EOLIST)

modules/proxy/NWGNUproxyscgi

@@ -205,8 +205,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@$(OBJDIR)/mod_proxy.imp \
 	@libc.imp \
 	$(EOLIST)

modules/proxy/NWGNUserf

@@ -263,8 +263,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	GetProcessSwitchCount \
 	RunningProcess \

modules/session/NWGNUsession

@@ -204,8 +204,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/session/NWGNUsession_cookie

@@ -205,8 +205,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	ap_hook_session_load \
 	ap_hook_session_save \

modules/session/NWGNUsession_crypto

@@ -205,8 +205,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	ap_hook_session_decode \
 	ap_hook_session_encode \

modules/session/NWGNUsession_dbd

@@ -206,8 +206,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	ap_hook_session_load \
 	ap_hook_session_save \

modules/slotmem/NWGNUslotmem_plain

@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/slotmem/NWGNUslotmem_shm

@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/ssl/NWGNUmakefile

@@ -261,7 +261,7 @@ FILE_nlm_copyright =
 #
 FILES_nlm_Ximports = \
 	@libc.imp \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
 	@httpd.imp \
 	$(EOLIST)
 

modules/test/NWGNUoptfnexport

@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/test/NWGNUoptfnimport

@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/test/NWGNUopthookexport

@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

modules/test/NWGNUopthookimport

@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
-	@$(NWOS)/httpd.imp \
+	@httpd.imp \
 	@libc.imp \
 	$(EOLIST)
 

support/NWGNUab

@@ -267,7 +267,7 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
 	@libc.imp \
 	$(EOLIST)
 

support/NWGNUhtcacheclean

@@ -209,7 +209,7 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
 	@libc.imp \
 	$(EOLIST)
  

support/NWGNUhtdbm

@@ -207,7 +207,7 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
 	@libc.imp \
 	$(EOLIST)
 

support/NWGNUhtdigest

@@ -207,7 +207,7 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
 	@libc.imp \
 	$(EOLIST)
  

support/NWGNUhtpasswd

@@ -207,7 +207,7 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
 	@libc.imp \
 	$(EOLIST)
  

support/NWGNUhttxt2dbm

@@ -207,7 +207,7 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
 	@libc.imp \
 	$(EOLIST)
 

support/NWGNUlogres

@@ -208,7 +208,7 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
 	@libc.imp \
 	$(EOLIST)
 

support/NWGNUrotlogs

@@ -206,7 +206,7 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-	@$(APR)/aprlib.imp \
+	@aprlib.imp \
 	@libc.imp \
 	$(EOLIST)