use awk var; use APR makefile to clean APR files.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@552804 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile
index 582c2c93324ef8389a02f9c31fce7bcacf8c6ac1..423a73d9e1517d89466bde96d1b46c9424d29141 100644 (file)
--- a/build/NWGNUmakefile
+++ b/build/NWGNUmakefile
@@ -27,7 +27,7 @@ nlms :: $(NWOS)/httpd.imp
 
 $(NWOS)/httpd.imp : make_nw_export.awk nw_export.i
        @echo Generating $(subst /,\,$@)
-       awk -f make_nw_export.awk nw_export.i | sort >$(NWOS)/httpd.imp
+       $(AWK) -f make_nw_export.awk nw_export.i | sort >$(NWOS)/httpd.imp
     
 nw_export.i : nw_export.inc $(FILES_prebuild_headers) cc.opt
        @echo Generating $(subst /,\,$@)
@@ -73,10 +73,8 @@ clean ::
        $(CHK) nw_export.i                                  $(DEL) nw_export.i
        $(CHK) cc.opt                                       $(DEL) cc.opt
        $(CHK) NWGNUversion.inc                             $(DEL) NWGNUversion.inc
-       $(CHK) $(subst /,\,$(APR))\include\apr.h            $(DEL) $(subst /,\,$(APR))\include\apr.h
-       $(CHK) $(subst /,\,$(APRUTIL))\include\apu.h        $(DEL) $(subst /,\,$(APRUTIL))\include\apu.h
-       $(CHK) $(subst /,\,$(APRUTIL))\include\apr_ldap.h   $(DEL) $(subst /,\,$(APRUTIL))\include\apr_ldap.h
        $(CHK) $(subst /,\,$(PCRE))\config.h                $(DEL) $(subst /,\,$(PCRE))\config.h
        $(CHK) $(subst /,\,$(PCRE))\pcre.h                  $(DEL) $(subst /,\,$(PCRE))\pcre.h
        $(CHK) $(subst /,\,$(NWOS))\httpd.imp               $(DEL) $(subst /,\,$(NWOS))\httpd.imp
+       $(MAKE) -C $(APR) -f NWGNUmakefile clean