Merge r1886098 from trunk:

* Do variable setting in a more portable way such that it works on MacOS as well
Submitted by: rpluem
Reviewed by: rpluem, jorton, ylavic

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

diff --git a/Makefile.in b/Makefile.in
index db47934946d43ce91d27ffaa069ba13acea73534..9ae3c9760f913fd46b0297b5e0c5c0c508812482 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -158,7 +158,7 @@ docs:
 update-changes:
        @for i in `find changes-entries -type f`; do \
            cp CHANGES CHANGES.tmp ; \
-           awk -vfname=$$i 'BEGIN{done = 0} \
+           awk -v fname=$$i 'BEGIN{done = 0} \
                            done == 0 && /^Changes with Apache /{ active = 1; print; next}; \
                            /^ *\*/ && active == 1 && done == 0{rec=$$0; while(getline<fname){if (! ($$0 ~ /^ *$$/)){print}}printf "\n";print rec; active = 0; done = 1; next} //;' \
            CHANGES.tmp > CHANGES ; \

diff --git a/STATUS b/STATUS
index 2d099976048b11f6a3f941f6eb77b9570f599d3e..19bb937b5714e543c7813efca211a7704489e806 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -137,15 +137,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) Makefile: Do variable setting for awk in a more portable way such that it
-     works on MacOS as well.
-     Trunk version of patch:
-        https://svn.apache.org/r1886098
-     Backport version for 2.4.x of patch:
-      Trunk version of patch works
-      svn merge -c 1886098 ^/httpd/httpd/trunk .
-     +1: rpluem, jorton, ylavic
-
   *) core: Optimize 'ap_list_provider_names'. Save some memory and potentialy
      avoid some useless copy.
      trunk patch: http://svn.apache.org/r1883184