Commit ea392b36 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  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
parent f40ab94a

Makefile.win

+3 −3
Original line number Diff line number Diff line
@@ -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