winbuild: use WITH_PREFIX if given

Closes #4031

diff --git a/winbuild/BUILD.WINDOWS.txt b/winbuild/BUILD.WINDOWS.txt
index c75b15c4e5107a1523ce292bb9bb2d2dbe98a308..1ede14f01a774d0ad74567ec915c549d3ec5348e 100644 (file)
--- a/winbuild/BUILD.WINDOWS.txt
+++ b/winbuild/BUILD.WINDOWS.txt
@@ -86,6 +86,7 @@ where <options> is one or many of:
   WITH_CARES=<dll or static>     - Enable c-ares support, DLL or static\r
   WITH_ZLIB=<dll or static>      - Enable zlib support, DLL or static\r
   WITH_SSH2=<dll or static>      - Enable libSSH2 support, DLL or static\r
+  WITH_PREFIX=<dir>              - Where to install the build\r
   ENABLE_SSPI=<yes or no>        - Enable SSPI support, defaults to yes\r
   ENABLE_IPV6=<yes or no>        - Enable IPv6, defaults to yes\r
   ENABLE_IDN=<yes or no>         - Enable use of Windows IDN APIs, defaults to yes\r

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index 26ab9069336a3afd2e6a21ea72bd11b3382cc63b..f5c0c7b00f7af2dee78f11cca62e37fdf2b9cea1 100644 (file)
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -39,9 +39,13 @@ CFGSET=true
 !MESSAGE where <options> is one or many of:
 !MESSAGE   VC=<6,7,8,9,10,11,12,14,15>    - VC versions
 !MESSAGE   WITH_DEVEL=<path>              - Paths for the development files (SSL, zlib, etc.)
-!MESSAGE                                    Defaults to sibbling directory deps: ../deps
+!MESSAGE                                    Defaults to curl's sibling directory deps: ../deps
 !MESSAGE                                    Libraries can be fetched at https://windows.php.net/downloads/php-sdk/deps/
 !MESSAGE                                    Uncompress them into the deps folder.
+!MESSAGE   WITH_PREFIX=<path>             - Installation directory path
+!MESSAGE                                    Defaults to a configuration dependent (SSL, zlib, etc.)\r
+!MESSAGE                                    directory inside curl's subdirectory builds: ./builds\r
+!MESSAGE                                    Use backslashes as path separator
 !MESSAGE   WITH_SSL=<dll or static>       - Enable OpenSSL support, DLL or static
 !MESSAGE   WITH_NGHTTP2=<dll or static>   - Enable HTTP/2 support, DLL or static
 !MESSAGE   WITH_CARES=<dll or static>     - Enable c-ares support, DLL or static

diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 8d942b759e3e53e89e94186df9f15b7fb715e9ff..993ab38bc8d1688812ff51bff88a012136949812 100644 (file)
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -486,8 +486,13 @@ CFLAGS = $(CFLAGS) /DCURL_WITH_MULTI_SSL
 !ENDIF\r
 \r
 LIB_DIROBJ = ..\builds\$(CONFIG_NAME_LIB)-obj-lib\r
-CURL_DIROBJ = ..\builds\$(CONFIG_NAME_LIB)-obj-curl\r
-DIRDIST = ..\builds\$(CONFIG_NAME_LIB)\\r
+CURL_DIROBJ = ..\builds\$(CONFIG_NAME_LIB)-obj-curl
+
+!IFDEF WITH_PREFIX
+DIRDIST = $(WITH_PREFIX)
+!ELSE
+DIRDIST = ..\builds\$(CONFIG_NAME_LIB)\
+!ENDIF
 \r
 #\r
 # curl.exe\r