This is an automated email from the ASF dual-hosted git repository.

mturk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git


The following commit(s) were added to refs/heads/master by this push:
     new cf2f96c  Use .vc suffix for windows makefile
cf2f96c is described below

commit cf2f96cb8595b57ff7b2bd52cea7fd1d1c501a88
Author: Mladen Turk <mt...@apache.org>
AuthorDate: Sat Jun 13 15:40:24 2020 +0200

    Use .vc suffix for windows makefile
---
 native/iis/{Makefile => Makefile.vc}      | 4 ++--
 native/iis/README                         | 4 ++--
 native/iis/pcre/{Makefile => Makefile.vc} | 0
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/native/iis/Makefile b/native/iis/Makefile.vc
similarity index 95%
rename from native/iis/Makefile
rename to native/iis/Makefile.vc
index 9572e19..4d3de57 100644
--- a/native/iis/Makefile
+++ b/native/iis/Makefile.vc
@@ -88,7 +88,7 @@ $(BUILDRES): ..\common\jk.rc
 
 $(PCRELIB):
        @cd .\pcre
-       $(MAKE)
+       $(MAKE) -f Makefile.vc
        @if not ERRORLEVEL 0 exit /B 1
        @cd ..
 
@@ -99,7 +99,7 @@ $(BUILDBIN): $(PCRELIB) $(WORKDIR) $(OBJECTS) $(BUILDRES)
 
 clean:
        @cd .\pcre
-       $(MAKE) clean
+       $(MAKE) -f Makefile.vc clean
        @if not ERRORLEVEL 0 exit /B 1
        @cd ..
        @-$(CLEANTARGET) 2>NUL
diff --git a/native/iis/README b/native/iis/README
index ac25a2d..2826220 100644
--- a/native/iis/README
+++ b/native/iis/README
@@ -29,12 +29,12 @@ Obtain the source code:
 Build  isapi_redirector.dll:
 
     c:\cmsc-15.0_28\setenv.bat x86
-    nmake
+    nmake -f Makefile.vc
 
     open new cmd.exe
 
     c:\cmsc-15.0_28\setenv.bat x64
-    nmake
+    nmake -f Makefile.vc
 
 Tomcat isapi_redirect DLLs may then be found in
     tomcat-connectors\native\iis\[x86|x64]_RELEASE
diff --git a/native/iis/pcre/Makefile b/native/iis/pcre/Makefile.vc
similarity index 100%
rename from native/iis/pcre/Makefile
rename to native/iis/pcre/Makefile.vc


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to