diff options
Diffstat (limited to 'tomcat')
| -rw-r--r-- | tomcat/ExternalProject_tomcat.mk | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/tomcat/ExternalProject_tomcat.mk b/tomcat/ExternalProject_tomcat.mk index 80006f8e105f..04e32730bf47 100644 --- a/tomcat/ExternalProject_tomcat.mk +++ b/tomcat/ExternalProject_tomcat.mk @@ -16,18 +16,17 @@ $(eval $(call gb_ExternalProject_register_targets,tomcat,\ )) $(call gb_ExternalProject_get_state_target,tomcat,build) : - cd "$(call gb_UnpackedTarball_get_dir,tomcat)/jakarta-servletapi-5" && \ - $(ICECREAM_RUN) "$(ANT)" \ - -q \ - -f build.xml \ - -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ - $(if $(filter yes,$(JAVACISGCJ))\ - ,-Dbuild.compiler=gcj \ - ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ - -Dant.build.javac.target=$(JAVA_TARGET_VER) \ - ) \ - $(if $(debug),-Dbuild.debug="on") \ - && \ - touch $@ + $(call gb_ExternalProject_run,build,\ + $(ICECREAM_RUN) "$(ANT)" \ + -q \ + -f build.xml \ + -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ + $(if $(filter yes,$(JAVACISGCJ))\ + ,-Dbuild.compiler=gcj \ + ,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \ + -Dant.build.javac.target=$(JAVA_TARGET_VER) \ + ) \ + $(if $(debug),-Dbuild.debug="on") \ + ,jakarta-servletapi-5) # vim: set noet sw=4 ts=4: |