From: Gregg Lewis Smith <gsmith@apache.org>
Date: Wed, 19 Apr 2017 00:40:31 +0000 (+0000)
Subject: apu-1.6-ify makefile.win. preserve building with apu<1.6
X-Git-Tag: 2.4.26~143
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3078ffc79fe1a7817bf750849787510747b28851;p=apache

apu-1.6-ify makefile.win. preserve building with apu<1.6


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

diff --git a/Makefile.win b/Makefile.win
index 66e562de5a..9e7b77dca5 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -80,6 +80,15 @@ SSLLIB=ssleay32
 !ENDIF
 !ENDIF
 
+# APU 1.6 (and up?)
+!IF EXIST("srclib\apr-util\xml\xml.mak")
+EXPAT=xml
+EXPBCK = ..
+!ELSE
+EXPAT=xml\expat\lib
+EXPBCK = ..\..\..
+!ENDIF
+
 default: _buildr
 
 !IF ("$(CTARGET)" == "") && ($(USESLN) == 1)
@@ -392,9 +401,9 @@ _build:
 	cd ..
 !ENDIF
 	cd ..\..
-	cd srclib\apr-util\xml\expat\lib
+	cd srclib\apr-util\$(EXPAT)
 	 $(MAKE) $(MAKEOPT) -f xml.mak             CFG="xml - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-	cd ..\..\..
+	cd $(EXPBCK)
 	 $(MAKE) $(MAKEOPT) -f aprutil.mak         CFG="aprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f libaprutil.mak      CFG="libaprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET)
 	cd ldap
@@ -1160,8 +1169,8 @@ BEGIN {
 !IF EXIST("srclib\apr-util")
 	copy srclib\apr-util\Lib$(SHORT)\aprutil-1.lib	"$(INSTDIR)\lib" <.y
 	copy srclib\apr-util\Lib$(SHORT)\aprutil-1.pdb	"$(INSTDIR)\lib" <.y
-	copy srclib\apr-util\xml\expat\lib\Lib$(SHORT)\xml.lib "$(INSTDIR)\lib" <.y
-	copy srclib\apr-util\xml\expat\lib\Lib$(SHORT)\xml.pdb "$(INSTDIR)\lib" <.y
+	copy srclib\apr-util\$(EXPAT)\Lib$(SHORT)\xml.lib "$(INSTDIR)\lib" <.y
+	copy srclib\apr-util\$(EXPAT)\Lib$(SHORT)\xml.pdb "$(INSTDIR)\lib" <.y
 	copy srclib\apr-util\$(LONG)\libaprutil-1.lib 	"$(INSTDIR)\lib" <.y
 	copy srclib\apr-util\$(LONG)\libaprutil-1.exp 	"$(INSTDIR)\lib" <.y
 	copy srclib\apr-iconv\$(LONG)\libapriconv-1.lib	"$(INSTDIR)\lib" <.y