From: William A. Rowe Jr <wrowe@apache.org>
Date: Wed, 14 Dec 2005 20:07:37 +0000 (+0000)
Subject:   Keep default INSTDIR out of a 2.0, 2.2 tree when working in svn trunk
X-Git-Tag: 2.3.0~2667
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44d3d407302cb09898eef41b417fd785738e60c8;p=thirdparty%2Fapache%2Fhttpd.git

  Keep default INSTDIR out of a 2.0, 2.2 tree when working in svn trunk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@356844 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/Makefile.win b/Makefile.win
index c470b2e8ec4..c59d2e6d685 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -33,10 +33,10 @@ CTARGET=/build
 
 !IF !EXIST("srclib\apr") || !EXIST("srclib\apr-util") || !EXIST("srclib\apr-iconv")
 !MESSAGE Please check out or download and unpack the Apache Portability Runtime
-!MESSAGE sources (apr, apr-iconv and apr-util) into your $(INSTDIR)\srclib dir.
+!MESSAGE sources (apr, apr-iconv and apr-util) into your srclib dir.
 !MESSAGE Apache cannot build without these libraries!
 !MESSAGE 
-!ERROR Need $(INSTDIR)\srclib\  apr, apr-iconv and apr-util
+!ERROR Need srclib\  apr, apr-iconv and apr-util
 !ENDIF
 
 # Note; _tryssl: is only used by the msvc developer studio environment to 'fix up'
@@ -104,7 +104,7 @@ _tryzlib:
 !ENDIF
 
 !IF "$(INSTDIR)" == ""
-INSTDIR=\Apache2
+INSTDIR=\Apache23
 !ENDIF
 !IF "$(SERVERNAME)" == ""
 SERVERNAME=localhost