You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mt...@apache.org on 2020/06/13 15:54:35 UTC
[tomcat-connectors] branch master updated: Add install task
defaults to APACHE2_HOME/modules unless PREFIX is defined on command line
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 ae75fe5 Add install task defaults to APACHE2_HOME/modules unless PREFIX is defined on command line
ae75fe5 is described below
commit ae75fe5daa80afe90fed83456045c1b7f6891063
Author: Mladen Turk <mt...@apache.org>
AuthorDate: Sat Jun 13 17:54:56 2020 +0200
Add install task defaults to APACHE2_HOME/modules unless PREFIX is defined on command line
---
native/apache-2.0/Makefile.vc | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/native/apache-2.0/Makefile.vc b/native/apache-2.0/Makefile.vc
index 72f3cdf..13d6980 100644
--- a/native/apache-2.0/Makefile.vc
+++ b/native/apache-2.0/Makefile.vc
@@ -29,6 +29,9 @@ APACHE2_LDIR=$(APACHE2_HOME)\lib
!IF !DEFINED(APACHE2_IDIR) || "$(APACHE2_IDIR)" == ""
APACHE2_IDIR=$(APACHE2_HOME)\include
!ENDIF
+!IF !DEFINED(PREFIX) || "$PREFIX)" == ""
+PREFIX=$(APACHE2_HOME)\modules
+!ENDIF
LIB = $(LIB);$(APACHE2_LDIR)
INCLUDE = $(INCLUDE);$(APACHE2_IDIR)
@@ -109,5 +112,9 @@ $(BUILDBIN): $(WORKDIR) $(OBJECTS) $(BUILDRES)
@if exist $(BUILDMFT) \
$(MT) -nologo -manifest $(BUILDMFT) -outputresource:$(BUILDBIN);2
+install : all
+ @-xcopy /I /Y /Q "$(WORKDIR)\*.so" "$(PREFIX)"
+ @-xcopy /I /Y /Q "$(WORKDIR)\*.pdb" "$(PREFIX)"
+
clean:
@-$(CLEANTARGET) 2>NUL
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org