From: Graham Leggett <minfrin@apache.org>
Date: Tue, 28 May 2013 14:27:32 +0000 (+0000)
Subject: makefile.win: Adjust makefile to properly detect the need to use devenv
X-Git-Tag: 2.4.5~208
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4ce8d8edec2759e8e9efff55ce79cec29ce6789;p=apache

makefile.win: Adjust makefile to properly detect the need to use devenv
on applicable MSVC versions.

trunk patch: http://svn.apache.org/r1482041
Submitted by: gsmith
Reviewed by: jim, minfrin


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

diff --git a/Makefile.win b/Makefile.win
index afdae74ca0..76c08731d2 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -42,7 +42,7 @@
 # so the server root should be given in forward slashes (quoted),
 # preferably with the drive designation!
 
-!IF EXIST("httpd.vcproj") && ([devenv /help > NUL 2>&1] == 0) \
+!IF EXIST("Apache.sln") && ([devenv /help > NUL 2>&1] == 0) \
     && !defined(USEMAK) && !defined(USEDSW)
 USESLN=1
 USEMAK=0
diff --git a/STATUS b/STATUS
index 13592070dd..31a2109c93 100644
--- a/STATUS
+++ b/STATUS
@@ -90,12 +90,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
  
-    * makefile.win: Adjust makefile to properly detect the need to use devenv
-      on applicable MSVC versions.
-      trunk patch: http://svn.apache.org/r1482041
-      2.4.x patch: trunk patch works with offset
-      +1: gsmith, jim, minfrin
-
  
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK: