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

diff --git a/modules/aaa/NWGNUaccesscompat b/modules/aaa/NWGNUaccesscompat
index 09c2f47c7508ebd76458d36de788d69215df8f1e..fae1c8a8a8d663b7a3a42cf11ec6536f1e8f8aa8 100644 (file)
--- a/modules/aaa/NWGNUaccesscompat
+++ b/modules/aaa/NWGNUaccesscompat
@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/aaa/NWGNUallowmethods b/modules/aaa/NWGNUallowmethods
index aeda73c29817fda1db1d409e8799dacb068a375b..1be811d719a8dae40ffcb97987afdf4ae5fb587e 100644 (file)
--- a/modules/aaa/NWGNUallowmethods
+++ b/modules/aaa/NWGNUallowmethods
@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/aaa/NWGNUauthbasc b/modules/aaa/NWGNUauthbasc
index 764b90bda31733d062dd95664073576751258b0c..b6f00a681a15479ebd4e0cff8dbfe155f53502a2 100644 (file)
--- a/modules/aaa/NWGNUauthbasc
+++ b/modules/aaa/NWGNUauthbasc
@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/aaa/NWGNUauthdigt b/modules/aaa/NWGNUauthdigt
index 2302eeabe4fb6e47cf202d1f87badf0399165f68..20d8c38b10e210517f7811a541e6c27209cb0c7e 100644 (file)
--- a/modules/aaa/NWGNUauthdigt
+++ b/modules/aaa/NWGNUauthdigt
@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/aaa/NWGNUauthform b/modules/aaa/NWGNUauthform
index 4d9e943aeb8b5f9a93ff152d78f3a095f6abb637..e8e3e25a6757d75b1bab2dcd080491ac0aedbbba 100644 (file)
--- a/modules/aaa/NWGNUauthform
+++ b/modules/aaa/NWGNUauthform
@@ -203,8 +203,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/aaa/NWGNUauthnano b/modules/aaa/NWGNUauthnano
index c14ea8fbf5c1c019f054959a5d0b094c6ffae8f9..23a0f034aac00287f881d43a7502b1e8585a2220 100644 (file)
--- a/modules/aaa/NWGNUauthnano
+++ b/modules/aaa/NWGNUauthnano
@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/aaa/NWGNUauthndbd b/modules/aaa/NWGNUauthndbd
index 70c0ec64a1f6f88bd7a5e8ee5cbf513c9b79f9b7..97e678d410babea05598706808d2daeda38745d8 100644 (file)
--- a/modules/aaa/NWGNUauthndbd
+++ b/modules/aaa/NWGNUauthndbd
@@ -202,8 +202,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/aaa/NWGNUauthndbm b/modules/aaa/NWGNUauthndbm
index 4dac6cd22424bc87fb29aad965bae7abd0bfd17e..d8e5c602ebea0f4fdadfe96f2e04a506fc70ced6 100644 (file)
--- a/modules/aaa/NWGNUauthndbm
+++ b/modules/aaa/NWGNUauthndbm
@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/aaa/NWGNUauthnfil b/modules/aaa/NWGNUauthnfil
index 1cb4f8e03798ac066f6b01da8aa82b6a7153d464..721c797b5d678ff2f90ab4a4d74bd8bdaae0688e 100644 (file)
--- a/modules/aaa/NWGNUauthnfil
+++ b/modules/aaa/NWGNUauthnfil
@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/aaa/NWGNUauthnsocache b/modules/aaa/NWGNUauthnsocache
index 90bc9d65657d78d123305c7f1e045b384818560e..c0a8a2557a1bcc21ac8892ced66929b853b83e8d 100644 (file)
--- a/modules/aaa/NWGNUauthnsocache
+++ b/modules/aaa/NWGNUauthnsocache
@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/aaa/NWGNUauthnzldap b/modules/aaa/NWGNUauthnzldap
index a71ed61260cbefa97c5fac293ef3bd04349d0a85..485272ef81530c2fb963cf336e944c2a841bc339 100644 (file)
--- a/modules/aaa/NWGNUauthnzldap
+++ b/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 \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
-       @$(LDAPSDK)/imports/lldapsdk.imp \
+       @lldapsdk.imp \
        $(EOLIST)
 
 #

diff --git a/modules/aaa/NWGNUauthzdbd b/modules/aaa/NWGNUauthzdbd
index c11866961726dd24f5ac7e035a02fdedc173843e..87347763ccff3fdf16f9e68417f7c08d4fbbf741 100644 (file)
--- a/modules/aaa/NWGNUauthzdbd
+++ b/modules/aaa/NWGNUauthzdbd
@@ -202,8 +202,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/aaa/NWGNUauthzdbm b/modules/aaa/NWGNUauthzdbm
index 1f85143e72d4cb7520f7499934dd949dc8d5ab2a..8a8392398e7c5f5afce6a7f83d5a228205d8e7bc 100644 (file)
--- a/modules/aaa/NWGNUauthzdbm
+++ b/modules/aaa/NWGNUauthzdbm
@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/aaa/NWGNUauthzgrp b/modules/aaa/NWGNUauthzgrp
index a39d97da55127214754cd6d6877d066af9b753e8..9dce54227b0bac3c81e3cfefed6a876670e10fc0 100644 (file)
--- a/modules/aaa/NWGNUauthzgrp
+++ b/modules/aaa/NWGNUauthzgrp
@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/aaa/NWGNUauthzusr b/modules/aaa/NWGNUauthzusr
index d19fc279f40bffb36b98e78b65493f97032544c0..22028d59d0c8871f104655b1f17353ff4d617d73 100644 (file)
--- a/modules/aaa/NWGNUauthzusr
+++ b/modules/aaa/NWGNUauthzusr
@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/cache/NWGNUcach_dsk b/modules/cache/NWGNUcach_dsk
index bcab57958a0ab3d3a9d292f3e508b420f49d5e9f..2c76d81c8fdc9e7e15d073a9d1f17cca9987d2ca 100644 (file)
--- a/modules/cache/NWGNUcach_dsk
+++ b/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)

diff --git a/modules/cache/NWGNUmod_cach b/modules/cache/NWGNUmod_cach
index 412fa64fcd1a91384ad76d443f668ff9200833e3..a56f64f5e53f26866e31268cb8a979d46e680fa8 100644 (file)
--- a/modules/cache/NWGNUmod_cach
+++ b/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)

diff --git a/modules/cache/NWGNUsocachdbm b/modules/cache/NWGNUsocachdbm
index b37ada7e884c39faf898b441293f0f2e250c9e01..10acddc3203d30d20362ec32418b732e41b6effd 100644 (file)
--- a/modules/cache/NWGNUsocachdbm
+++ b/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)

diff --git a/modules/cache/NWGNUsocachshmcb b/modules/cache/NWGNUsocachshmcb
index fe2f2f67997d9ab4323ffd053252887927195284..9cbb321201045a03c89ab41ed75409ee7b433927 100644 (file)
--- a/modules/cache/NWGNUsocachshmcb
+++ b/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)

diff --git a/modules/cluster/NWGNUmodheartbeat b/modules/cluster/NWGNUmodheartbeat
index fa7283ee10e883d99a30dd11099fc339e58f8c9e..44e80ee821a8b5a1182c725a5e061ebc4966e764 100644 (file)
--- a/modules/cluster/NWGNUmodheartbeat
+++ b/modules/cluster/NWGNUmodheartbeat
@@ -210,8 +210,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/cluster/NWGNUmodheartmonitor b/modules/cluster/NWGNUmodheartmonitor
index a4d063f7c907d083e625de1860a1c0ccce9a6d51..f4254e1c7d9c9ea56d0a1bf2573d323a422999a1 100644 (file)
--- a/modules/cluster/NWGNUmodheartmonitor
+++ b/modules/cluster/NWGNUmodheartmonitor
@@ -210,8 +210,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/database/NWGNUmakefile b/modules/database/NWGNUmakefile
index b577c4022c5fd972e3966511756aa978c5c8d72f..4598b638125ffddc70db842fc2772b054c6ba6d9 100644 (file)
--- a/modules/database/NWGNUmakefile
+++ b/modules/database/NWGNUmakefile
@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/dav/fs/NWGNUmakefile b/modules/dav/fs/NWGNUmakefile
index 4b96b9c60719db560e23272b611d063cde9a43a4..5554cbf553d886c7b955cba607eef1653545baf2 100644 (file)
--- a/modules/dav/fs/NWGNUmakefile
+++ b/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)

diff --git a/modules/dav/lock/NWGNUmakefile b/modules/dav/lock/NWGNUmakefile
index f32aab279ad699c7cb02736c56bbe7c56336e6ab..269721e85fec689ae2f3eab7b934628bff17a904 100644 (file)
--- a/modules/dav/lock/NWGNUmakefile
+++ b/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)

diff --git a/modules/dav/main/NWGNUmakefile b/modules/dav/main/NWGNUmakefile
index 2cb305752b6773fd67195315003794ebd46b4bdd..5f25e953c07cc5463becebbdccaed43ef66da4ac 100644 (file)
--- a/modules/dav/main/NWGNUmakefile
+++ b/modules/dav/main/NWGNUmakefile
@@ -220,7 +220,7 @@ FILE_nlm_copyright =
 #
 FILES_nlm_Ximports = \
        @libc.imp \
-       @$(APR)/aprlib.imp \
+       @aprlib.imp \
        @httpd.imp \
        $(EOLIST)
 

diff --git a/modules/debugging/NWGNUmodbucketeer b/modules/debugging/NWGNUmodbucketeer
index 8fde3f7136bc11bbe4952f6aa45ec38a31f7d736..4441a3b97be3a322a5c0c5f195ba6b2ca5984707 100644 (file)
--- a/modules/debugging/NWGNUmodbucketeer
+++ b/modules/debugging/NWGNUmodbucketeer
@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/debugging/NWGNUmoddumpio b/modules/debugging/NWGNUmoddumpio
index cb68a64a58ef7231626d6f30144734537ff070cb..d2c281c78548a75ff9753ecbdacfd1cad9ac26e5 100644 (file)
--- a/modules/debugging/NWGNUmoddumpio
+++ b/modules/debugging/NWGNUmoddumpio
@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/echo/NWGNUmakefile b/modules/echo/NWGNUmakefile
index 8808398c0d693d1e58c46b79bde9cec7d427a059..6c99a857cd152f0d8cb7db912f4cfcf33ae40a48 100644 (file)
--- a/modules/echo/NWGNUmakefile
+++ b/modules/echo/NWGNUmakefile
@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/examples/NWGNUcase_flt b/modules/examples/NWGNUcase_flt
index ce24969ad6599dcc86fe67ab0184874b8231e706..9c215d088206fbf6c2810e44f34526f1c22891a1 100644 (file)
--- a/modules/examples/NWGNUcase_flt
+++ b/modules/examples/NWGNUcase_flt
@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/examples/NWGNUcase_flt_in b/modules/examples/NWGNUcase_flt_in
index 8d71b32f1d5bd2ac2d61cfafed39c5d847d04cc8..aeffa975d92f891b1b7e195b21ad4a54d2308f23 100644 (file)
--- a/modules/examples/NWGNUcase_flt_in
+++ b/modules/examples/NWGNUcase_flt_in
@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/examples/NWGNUexample_hooks b/modules/examples/NWGNUexample_hooks
index 5430661052cdabb5782d2ba75789f3cfdc08459a..1948073ba5c0eabc502c1f559453f844385bb994 100644 (file)
--- a/modules/examples/NWGNUexample_hooks
+++ b/modules/examples/NWGNUexample_hooks
@@ -210,8 +210,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/examples/NWGNUexample_ipc b/modules/examples/NWGNUexample_ipc
index db207b1c84e0d73fa4ff819f47633616a1b46077..408e7989fdbfe525d0307b54bf0e926906e4ade8 100644 (file)
--- a/modules/examples/NWGNUexample_ipc
+++ b/modules/examples/NWGNUexample_ipc
@@ -210,8 +210,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/experimental/NWGNUnoloris b/modules/experimental/NWGNUnoloris
index 8af033caa36fc9aa5e48d2ead59d3671efba1d7f..df51ae8fff0083901a91ab4d982648c7941d352a 100644 (file)
--- a/modules/experimental/NWGNUnoloris
+++ b/modules/experimental/NWGNUnoloris
@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/filters/NWGNUcharsetl b/modules/filters/NWGNUcharsetl
index ce9c22bbcbfc85861c70e7b07f1075b98a9059e6..7bae0e547b389eeb4b631ed458fd07b91eeddb28 100644 (file)
--- a/modules/filters/NWGNUcharsetl
+++ b/modules/filters/NWGNUcharsetl
@@ -210,8 +210,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/filters/NWGNUdeflate b/modules/filters/NWGNUdeflate
index 196f59bf44caacc3776914374db975e16fdd6c25..1a11f9710f305a5080e2433712743155f9fead67 100644 (file)
--- a/modules/filters/NWGNUdeflate
+++ b/modules/filters/NWGNUdeflate
@@ -228,8 +228,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/filters/NWGNUextfiltr b/modules/filters/NWGNUextfiltr
index cd242e25cc75333dfb152ee16db70e5d341e9a59..aa2e64d623471578c105c76a969639b18c235a96 100644 (file)
--- a/modules/filters/NWGNUextfiltr
+++ b/modules/filters/NWGNUextfiltr
@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/filters/NWGNUmod_filter b/modules/filters/NWGNUmod_filter
index aee02c0ced37d980566a7208ec889739fd8d430c..6aaa06a6eaf59040d7bfc455a4504e5753f2f300 100644 (file)
--- a/modules/filters/NWGNUmod_filter
+++ b/modules/filters/NWGNUmod_filter
@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/filters/NWGNUmod_request b/modules/filters/NWGNUmod_request
index a725a139019575ca0d102e4d524c7b7ad3d42ecf..684539bc13f71798304175a2608c0de06f90443d 100644 (file)
--- a/modules/filters/NWGNUmod_request
+++ b/modules/filters/NWGNUmod_request
@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/filters/NWGNUmodbuffer b/modules/filters/NWGNUmodbuffer
index fd5704959af6a6fbccef66059de68cfc792713d9..df525bdd62a74f38c24c0935c7f1a330e3d8db2e 100644 (file)
--- a/modules/filters/NWGNUmodbuffer
+++ b/modules/filters/NWGNUmodbuffer
@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/filters/NWGNUmodsed b/modules/filters/NWGNUmodsed
index 50de4a3fdff68b05f675a39f40d93acf01c826d6..487ace5fbc3d06595822f59d932518baffd114cc 100644 (file)
--- a/modules/filters/NWGNUmodsed
+++ b/modules/filters/NWGNUmodsed
@@ -212,8 +212,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/filters/NWGNUratelimit b/modules/filters/NWGNUratelimit
index 0d1df3d01d03e24b37da7ceef6de93113dde5d0c..ceed35ff52ac2a6a9e5468deaf0b6c7d801a452d 100644 (file)
--- a/modules/filters/NWGNUratelimit
+++ b/modules/filters/NWGNUratelimit
@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/filters/NWGNUreflector b/modules/filters/NWGNUreflector
index 43c0bb619580778ccb35321f56e82c28970200e5..9fdb0e7614105863829d9362954ec8bac13b3ec1 100644 (file)
--- a/modules/filters/NWGNUreflector
+++ b/modules/filters/NWGNUreflector
@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/filters/NWGNUreqtimeout b/modules/filters/NWGNUreqtimeout
index 00e04c171119397572f2d6c0485e35653c5e13eb..4ff7c7786e5bd22ce164ec6fbd27d7924a648916 100644 (file)
--- a/modules/filters/NWGNUreqtimeout
+++ b/modules/filters/NWGNUreqtimeout
@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/filters/NWGNUsubstitute b/modules/filters/NWGNUsubstitute
index f7b4229fe1471e5a3e8d029b665b43f47826529d..09cb3682fec24ba6b35c67071d79bcd93e21b17a 100644 (file)
--- a/modules/filters/NWGNUsubstitute
+++ b/modules/filters/NWGNUsubstitute
@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/generators/NWGNUautoindex b/modules/generators/NWGNUautoindex
index 7ae6f5b025936e5f802665047f4bbe94b6f35a9c..535f9073768b1c395144d1b0f88ff8911407beb3 100644 (file)
--- a/modules/generators/NWGNUautoindex
+++ b/modules/generators/NWGNUautoindex
@@ -202,8 +202,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/generators/NWGNUinfo b/modules/generators/NWGNUinfo
index f1973cd4ef6429c50a5095dae19fafbfb2f4de78..633f24f08063128a91ccfea1fa809c199e941f5f 100644 (file)
--- a/modules/generators/NWGNUinfo
+++ b/modules/generators/NWGNUinfo
@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/generators/NWGNUmod_asis b/modules/generators/NWGNUmod_asis
index 19ceb7da1c6a6aba560de94747a459ee4b71a700..ece1c580945e04bc919eb33b91d40703a5164135 100644 (file)
--- a/modules/generators/NWGNUmod_asis
+++ b/modules/generators/NWGNUmod_asis
@@ -202,8 +202,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/generators/NWGNUmod_cgi b/modules/generators/NWGNUmod_cgi
index bbe756cc82bcb129fdca3bbefe334320cba6466f..a555163afff85419d9d4cd8570f1150b98c7b250 100644 (file)
--- a/modules/generators/NWGNUmod_cgi
+++ b/modules/generators/NWGNUmod_cgi
@@ -203,8 +203,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/generators/NWGNUstatus b/modules/generators/NWGNUstatus
index 58cf68c02d85d78cbce7b20dbb58e6059b34b231..dbabe667de469f9d9970682d0eedb074ff03ba53 100644 (file)
--- a/modules/generators/NWGNUstatus
+++ b/modules/generators/NWGNUstatus
@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/ldap/NWGNUmakefile b/modules/ldap/NWGNUmakefile
index d4d3587789780710e63bc68b11d9ed272eb4c898..3a0dce35e5a4f399cb9740fe7c2830728b6e8901 100644 (file)
--- a/modules/ldap/NWGNUmakefile
+++ b/modules/ldap/NWGNUmakefile
@@ -214,11 +214,11 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
-       @$(LDAPSDK)/imports/lldapsdk.imp \
-       @$(LDAPSDK)/imports/lldapssl.imp \
+       @lldapsdk.imp \
+       @lldapssl.imp \
        $(EOLIST)
 
 #

diff --git a/modules/loggers/NWGNUforensic b/modules/loggers/NWGNUforensic
index ce13a4149a774b64d023c530fa2cbf1c46f36911..c3e45946a6395f21656a85bf2f6fb6c9b3937b61 100644 (file)
--- a/modules/loggers/NWGNUforensic
+++ b/modules/loggers/NWGNUforensic
@@ -210,8 +210,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/loggers/NWGNUmodlogio b/modules/loggers/NWGNUmodlogio
index ecf1ec26895996a57a3c27acc7c3d1df6d9b2a07..c58ef77800605ffd4913a4fc220e31a76d4a87ca 100644 (file)
--- a/modules/loggers/NWGNUmodlogio
+++ b/modules/loggers/NWGNUmodlogio
@@ -210,8 +210,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/lua/NWGNUmakefile b/modules/lua/NWGNUmakefile
index 19fa1d2de8256ce901a1245536691e1a83674428..629f15950d5b75446ef25d218160fae442ac78df 100644 (file)
--- a/modules/lua/NWGNUmakefile
+++ b/modules/lua/NWGNUmakefile
@@ -219,8 +219,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/mappers/NWGNUactions b/modules/mappers/NWGNUactions
index d4e12efbd34928b4c512edb15abfd902f03f5c27..12e078a6c42eee79f4c57757bce2aa9ea7026afa 100644 (file)
--- a/modules/mappers/NWGNUactions
+++ b/modules/mappers/NWGNUactions
@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/mappers/NWGNUimagemap b/modules/mappers/NWGNUimagemap
index 268f14b490d099666e7d701abb1e81356c713f2b..12f972f3b21d086b52a16d30361d2b9eba66a5e2 100644 (file)
--- a/modules/mappers/NWGNUimagemap
+++ b/modules/mappers/NWGNUimagemap
@@ -202,8 +202,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/mappers/NWGNUrewrite b/modules/mappers/NWGNUrewrite
index bf830100eb784a423c83eeb856c120202ad912fe..9ec824f10699e4f37033023e06f18b0863b0358d 100644 (file)
--- a/modules/mappers/NWGNUrewrite
+++ b/modules/mappers/NWGNUrewrite
@@ -203,8 +203,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/mappers/NWGNUspeling b/modules/mappers/NWGNUspeling
index 0e6f94a3633dfd4e8d804da04d6537dfdc9de631..68ac5fa969fd0e852b038fa7a7a76ac713c1e067 100644 (file)
--- a/modules/mappers/NWGNUspeling
+++ b/modules/mappers/NWGNUspeling
@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/mappers/NWGNUuserdir b/modules/mappers/NWGNUuserdir
index e7508da04f63e69231c8bfb54a13454dde55406d..09f47efe8f4a7f04deaac66956019d889a1670ee 100644 (file)
--- a/modules/mappers/NWGNUuserdir
+++ b/modules/mappers/NWGNUuserdir
@@ -202,8 +202,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/mappers/NWGNUvhost b/modules/mappers/NWGNUvhost
index 92de7f9d80d7f9f3098476143575c5f4d2cdd23e..69b4f88381c0838e245411b18e883b0ea03649e1 100644 (file)
--- a/modules/mappers/NWGNUvhost
+++ b/modules/mappers/NWGNUvhost
@@ -202,8 +202,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/metadata/NWGNUcernmeta b/modules/metadata/NWGNUcernmeta
index 53b61ee687912c31a4b201c6aa3982a2d1e39d7e..5a193137ebcd267c40e99d19afec76f7a3a76caa 100644 (file)
--- a/modules/metadata/NWGNUcernmeta
+++ b/modules/metadata/NWGNUcernmeta
@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/metadata/NWGNUexpires b/modules/metadata/NWGNUexpires
index 815c60fe5701e274b85c89f1f36ae5ef36730163..39c39353ee5853e53547e4731cebfc6893d83e31 100644 (file)
--- a/modules/metadata/NWGNUexpires
+++ b/modules/metadata/NWGNUexpires
@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/metadata/NWGNUheaders b/modules/metadata/NWGNUheaders
index 379d9f2e6ddcfac5beeb55c87a0c5fe7f6917850..f5fe0aed21533c94eaf7b2ad886e6493051d3561 100644 (file)
--- a/modules/metadata/NWGNUheaders
+++ b/modules/metadata/NWGNUheaders
@@ -202,8 +202,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/metadata/NWGNUmimemagi b/modules/metadata/NWGNUmimemagi
index cc73c21a623770ad323de1741d41490ccf353dd7..0ed184b0a9349df6838e53b9e9a6d503e710289b 100644 (file)
--- a/modules/metadata/NWGNUmimemagi
+++ b/modules/metadata/NWGNUmimemagi
@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/metadata/NWGNUmodident b/modules/metadata/NWGNUmodident
index 2ccf91946b143716aed91f3e7a699bd1da92cabe..fa5880fb962af52f18373be08f351c415ee2da28 100644 (file)
--- a/modules/metadata/NWGNUmodident
+++ b/modules/metadata/NWGNUmodident
@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/metadata/NWGNUmodversion b/modules/metadata/NWGNUmodversion
index ba1a15bd1ce36fb2a1cf834459a7c0b64d2f4dc2..27423ea27c01734ecc1ae819f58d9ba039a614b4 100644 (file)
--- a/modules/metadata/NWGNUmodversion
+++ b/modules/metadata/NWGNUmodversion
@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/metadata/NWGNUremoteip b/modules/metadata/NWGNUremoteip
index da32736375860d73acd1a41872d6f0c8f69afbcd..69f80cdc0d3dd38ef15cf98b5016d947550d8384 100644 (file)
--- a/modules/metadata/NWGNUremoteip
+++ b/modules/metadata/NWGNUremoteip
@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/metadata/NWGNUuniqueid b/modules/metadata/NWGNUuniqueid
index e2bf1cde1db6960a4160c4180b228b871c6f40c9..ed71d67b611bd671fa2c03c5e29a6b0004e6b54c 100644 (file)
--- a/modules/metadata/NWGNUuniqueid
+++ b/modules/metadata/NWGNUuniqueid
@@ -202,8 +202,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/metadata/NWGNUusertrk b/modules/metadata/NWGNUusertrk
index 56de73c35a8d9c6fc4bdaf711cd82b89c483250c..b39b88d530ba5097d08d88c6d893b3be6c55bbcf 100644 (file)
--- a/modules/metadata/NWGNUusertrk
+++ b/modules/metadata/NWGNUusertrk
@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/proxy/NWGNUproxy b/modules/proxy/NWGNUproxy
index c5e0dc376de2248b796f2b652a6000ac52734f86..d13d93fadaa3157db0732b606831fae2b47f64cb 100644 (file)
--- a/modules/proxy/NWGNUproxy
+++ b/modules/proxy/NWGNUproxy
@@ -206,8 +206,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/proxy/NWGNUproxyajp b/modules/proxy/NWGNUproxyajp
index 0c1ca9194073c568229c5e2065c3c7c29fb52756..108f1ed02a882fe1ffbafafedb504db572ac8c6b 100644 (file)
--- a/modules/proxy/NWGNUproxyajp
+++ b/modules/proxy/NWGNUproxyajp
@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @$(OBJDIR)/mod_proxy.imp \
        @libc.imp \
        $(EOLIST)

diff --git a/modules/proxy/NWGNUproxybalancer b/modules/proxy/NWGNUproxybalancer
index b29b0ba81450cd8ec20226fc418d8079b0e0d149..a5758e2010798872e9b40df8096f7b4f6a04eca5 100644 (file)
--- a/modules/proxy/NWGNUproxybalancer
+++ b/modules/proxy/NWGNUproxybalancer
@@ -205,8 +205,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @$(OBJDIR)/mod_proxy.imp \
        @libc.imp \
        $(EOLIST)

diff --git a/modules/proxy/NWGNUproxycon b/modules/proxy/NWGNUproxycon
index b4ba91fa3315b2d10a0ee1a6fff6810d27aa5394..4728f86cd87e87403dee597e1ad8a60a6270322e 100644 (file)
--- a/modules/proxy/NWGNUproxycon
+++ b/modules/proxy/NWGNUproxycon
@@ -204,8 +204,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @$(OBJDIR)/mod_proxy.imp \
        @libc.imp \
        $(EOLIST)

diff --git a/modules/proxy/NWGNUproxyfcgi b/modules/proxy/NWGNUproxyfcgi
index b28f86552b8788071eef6aaf78b94ef587badf39..c818d6c746969f78e9ce19c47f924cce98e9ceef 100644 (file)
--- a/modules/proxy/NWGNUproxyfcgi
+++ b/modules/proxy/NWGNUproxyfcgi
@@ -206,8 +206,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @$(OBJDIR)/mod_proxy.imp \
        @libc.imp \
        $(EOLIST)

diff --git a/modules/proxy/NWGNUproxyftp b/modules/proxy/NWGNUproxyftp
index e1bd7f7a181ec48d85e90d555fb746fec5844f62..7a2a1cf03ab5b9742668a9237d17954be8da14f9 100644 (file)
--- a/modules/proxy/NWGNUproxyftp
+++ b/modules/proxy/NWGNUproxyftp
@@ -205,8 +205,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @$(OBJDIR)/mod_proxy.imp \
        @libc.imp \
        $(EOLIST)

diff --git a/modules/proxy/NWGNUproxyhtp b/modules/proxy/NWGNUproxyhtp
index d8498c0cd8544f68b1298c65e65aa2c46bbb787b..f5bd53d9f60ce2a0b2af16f9ff35d0b7c3f6f542 100644 (file)
--- a/modules/proxy/NWGNUproxyhtp
+++ b/modules/proxy/NWGNUproxyhtp
@@ -205,8 +205,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @$(OBJDIR)/mod_proxy.imp \
        @libc.imp \
        $(EOLIST)

diff --git a/modules/proxy/NWGNUproxyscgi b/modules/proxy/NWGNUproxyscgi
index 34c561d8df823390318ae7ac056f284a2448ea53..749e2b6e29e8105ac767a4f31287dba46b2d081c 100644 (file)
--- a/modules/proxy/NWGNUproxyscgi
+++ b/modules/proxy/NWGNUproxyscgi
@@ -205,8 +205,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @$(OBJDIR)/mod_proxy.imp \
        @libc.imp \
        $(EOLIST)

diff --git a/modules/proxy/NWGNUserf b/modules/proxy/NWGNUserf
index 19deab10a14df666798321255d6a03e3da468147..341a92dccde8188d38db396b59d78747f4613238 100644 (file)
--- a/modules/proxy/NWGNUserf
+++ b/modules/proxy/NWGNUserf
@@ -263,8 +263,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        GetProcessSwitchCount \
        RunningProcess \

diff --git a/modules/session/NWGNUsession b/modules/session/NWGNUsession
index 7095fe03b801b61177c9e997278a9b5bd563bdf9..689d22812db7c5f37eb3837201ff9ab53c5ed904 100644 (file)
--- a/modules/session/NWGNUsession
+++ b/modules/session/NWGNUsession
@@ -204,8 +204,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/session/NWGNUsession_cookie b/modules/session/NWGNUsession_cookie
index 05a2d61f252b6e5ade85099e98168c6233268d20..bf2f6268c5ec03732a328f7907e96441d42c5582 100644 (file)
--- a/modules/session/NWGNUsession_cookie
+++ b/modules/session/NWGNUsession_cookie
@@ -205,8 +205,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        ap_hook_session_load \
        ap_hook_session_save \

diff --git a/modules/session/NWGNUsession_crypto b/modules/session/NWGNUsession_crypto
index 6b6793406204de7be7aad8deec4c7d6994ac5ee3..2d5208a8c54043369a760289b519f86099dd8255 100644 (file)
--- a/modules/session/NWGNUsession_crypto
+++ b/modules/session/NWGNUsession_crypto
@@ -205,8 +205,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        ap_hook_session_decode \
        ap_hook_session_encode \

diff --git a/modules/session/NWGNUsession_dbd b/modules/session/NWGNUsession_dbd
index 0fa9ee47c63134ed9fb271e3013b6c3811679713..483bb1a14b139bed553182bb337a97e311127b44 100644 (file)
--- a/modules/session/NWGNUsession_dbd
+++ b/modules/session/NWGNUsession_dbd
@@ -206,8 +206,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        ap_hook_session_load \
        ap_hook_session_save \

diff --git a/modules/slotmem/NWGNUslotmem_plain b/modules/slotmem/NWGNUslotmem_plain
index 6ab82334ea1ba36611327c3a8f51464965a4db47..37e358b6ae98588ca559eb10c9617ca275287475 100644 (file)
--- a/modules/slotmem/NWGNUslotmem_plain
+++ b/modules/slotmem/NWGNUslotmem_plain
@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/slotmem/NWGNUslotmem_shm b/modules/slotmem/NWGNUslotmem_shm
index fd91a1bb2bd8f9ee466c4507681a08b6e525735f..80212023667a0bdfc68f6dffc12dd57872724af7 100644 (file)
--- a/modules/slotmem/NWGNUslotmem_shm
+++ b/modules/slotmem/NWGNUslotmem_shm
@@ -201,8 +201,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/ssl/NWGNUmakefile b/modules/ssl/NWGNUmakefile
index 3b704148acf0808f55c31193ea4ad5ffe0ef3f48..9693249d50cb1cdb1cbb49bfbe2c95210a5a76c4 100644 (file)
--- a/modules/ssl/NWGNUmakefile
+++ b/modules/ssl/NWGNUmakefile
@@ -261,7 +261,7 @@ FILE_nlm_copyright =
 #
 FILES_nlm_Ximports = \
        @libc.imp \
-       @$(APR)/aprlib.imp \
+       @aprlib.imp \
        @httpd.imp \
        $(EOLIST)
 

diff --git a/modules/test/NWGNUoptfnexport b/modules/test/NWGNUoptfnexport
index db998e58876b06a9429b903ef31e5a517e4857f1..32a1a6d894c4e68d938fd96215653579e707172a 100644 (file)
--- a/modules/test/NWGNUoptfnexport
+++ b/modules/test/NWGNUoptfnexport
@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/test/NWGNUoptfnimport b/modules/test/NWGNUoptfnimport
index f90371a1baefcbc163b8f3727dc6ee0bc9902d79..1861243d3ec1b633d69d4ec17de6c45a37777fc6 100644 (file)
--- a/modules/test/NWGNUoptfnimport
+++ b/modules/test/NWGNUoptfnimport
@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/test/NWGNUopthookexport b/modules/test/NWGNUopthookexport
index c8089cf3cc70d6eec272faaee0bcd8170e7656a8..3c556343cb47a8fe06ef53b44055e79cc54d0108 100644 (file)
--- a/modules/test/NWGNUopthookexport
+++ b/modules/test/NWGNUopthookexport
@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/modules/test/NWGNUopthookimport b/modules/test/NWGNUopthookimport
index 1d5a47f91c87865ae5b047f2c595e8e41ac36252..e0bf3062bd0838af032801f279eb16b22843678f 100644 (file)
--- a/modules/test/NWGNUopthookimport
+++ b/modules/test/NWGNUopthookimport
@@ -209,8 +209,8 @@ FILE_nlm_copyright =
 # Any additional imports go here
 #
 FILES_nlm_Ximports = \
-       @$(APR)/aprlib.imp \
-       @$(NWOS)/httpd.imp \
+       @aprlib.imp \
+       @httpd.imp \
        @libc.imp \
        $(EOLIST)
 

diff --git a/support/NWGNUab b/support/NWGNUab
index 7f3cfebddfb4f9cfc90d40229c6082b3dac73d1b..07e8f0a3895068394c9fdb251509c06a97235bf2 100644 (file)
--- a/support/NWGNUab
+++ b/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)
 

diff --git a/support/NWGNUhtcacheclean b/support/NWGNUhtcacheclean
index 1e0b07d2690fb86ad8c928ad31570821efa299d2..c18a24a5633a5820d55a6e56934620c5223fb3de 100644 (file)
--- a/support/NWGNUhtcacheclean
+++ b/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)
  

diff --git a/support/NWGNUhtdbm b/support/NWGNUhtdbm
index 4b63d1f4752536ff8dd3a3cf12630310a9a7c2b2..7bfa67d35fcf764103375b153c1eb1845a35f8ee 100644 (file)
--- a/support/NWGNUhtdbm
+++ b/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)
 

diff --git a/support/NWGNUhtdigest b/support/NWGNUhtdigest
index 9353b14fdc9e008dd0416cd2eeecb5b1f2e4485a..14c2be54167196dfaac453275b4ade1681aff83d 100644 (file)
--- a/support/NWGNUhtdigest
+++ b/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)
  

diff --git a/support/NWGNUhtpasswd b/support/NWGNUhtpasswd
index a4dae30dd316a3ba62fc9f128a59a8d69dceaea2..f73287c31eda41151afdb639276383c2babae297 100644 (file)
--- a/support/NWGNUhtpasswd
+++ b/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)
  

diff --git a/support/NWGNUhttxt2dbm b/support/NWGNUhttxt2dbm
index 0123b372659dd655d7082f1839c744bdfb8f74f3..b361ecaa1f9e5f61aa27fc18a88d1a3c9a40fb92 100644 (file)
--- a/support/NWGNUhttxt2dbm
+++ b/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)
 

diff --git a/support/NWGNUlogres b/support/NWGNUlogres
index 435a613c4336dcf1d7fde5e88eb1ef873e46b3ab..915d3c6787504c592133c541d023fdb403538d6b 100644 (file)
--- a/support/NWGNUlogres
+++ b/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)
 

diff --git a/support/NWGNUrotlogs b/support/NWGNUrotlogs
index 4de7bf70f154a4a7f21dbed9e60dc4954d5b9b64..4074d629d92beb670202f6dbd8d763b38487cc04 100644 (file)
--- a/support/NWGNUrotlogs
+++ b/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)