From: Jeff Trawick <trawick@apache.org>
Date: Mon, 19 Aug 2013 11:53:34 +0000 (+0000)
Subject: Makefile.win: Install proper pcre DLL file during debug build install.
X-Git-Tag: 2.4.7~287
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e06f72db95b9dd5008a575813cb13338ad9390bd;p=apache

Makefile.win: Install proper pcre DLL file during debug build install.

PR: 55235
Submitted by: Ben Reser <ben reser org>
Reviewed by: gsmith, trawick, covener


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

diff --git a/CHANGES b/CHANGES
index 234f614770..9dea413a35 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.7
 
+  *) Makefile.win: Install proper pcre DLL file during debug build install.
+     PR 55235.  [Ben Reser <ben reser org>]
+
   *) mod_ldap: Fix a potential memory leak or corruption.  PR 54936.
      [Zhenbo Xu <zhenbo1987 gmail com>]
 
diff --git a/Makefile.win b/Makefile.win
index ec5889ec7c..cf34bcecdb 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -668,7 +668,11 @@ _copybin:
 	for %d in ($(DBM_LIST) x) do if not %d == x ( \
 	  copy srclib\$(UTILDIR)\dbm\$(LONG)\apr_dbm_%d-1.$(src_dll) "$(inst_dll)" <.y \
 	)
+!IF "$(SHORT)" == "D"
+	copy srclib\pcre\pcred.$(src_dll)			"$(inst_dll)" <.y
+!ELSE
 	copy srclib\pcre\pcre.$(src_dll)			"$(inst_dll)" <.y
+!ENDIF	
 	copy modules\aaa\$(LONG)\mod_access_compat.$(src_so) 	"$(inst_so)" <.y
 	copy modules\aaa\$(LONG)\mod_allowmethods.$(src_so) 	"$(inst_so)" <.y
 	copy modules\aaa\$(LONG)\mod_auth_basic.$(src_so) 	"$(inst_so)" <.y
diff --git a/STATUS b/STATUS
index b14279959f..0bb4e1a83e 100644
--- a/STATUS
+++ b/STATUS
@@ -104,12 +104,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
         http://svn.apache.org/r1514214
         http://svn.apache.org/r1514617
 
-  * Makefile.win: Install proper pcre DLL file during debug build install
-    PR55235 [Ben Reser <ben reser org>]
-    trunk: http://svn.apache.org/r1505073
-    2.4.x patch: http://people.apache.org/~gsmith/httpd/diffs/pr55235-2.4bp.diff
-    +1: gsmith, trawick, covener
-
   * configure: '--enable-maintainer-mode' should also auto-enable mod_bucketeer
     trunk: http://svn.apache.org/viewvc?view=revision&revision=1503680
     2.4.x patch: trunk patch works