Author: arist
Date: Wed Nov 14 23:41:59 2012
New Revision: 1409566
URL: http://svn.apache.org/viewvc?rev=1409566&view=rev
Log:
gnumake4_080_4cbea75d255a.patch
# HG changeset patch
# User Michael Stahl <m...@openoffice.org>
# Date 1302711100 0
# Node ID 4cbea75d255a838ecbf703daee0cfdf7cdbd3975
# Parent e86f5a26e982c5b364a7309b923c40a7b051010a
gnumake4: JavaClassSet.mk: strip whitespace when adding to CLASSPATH
Modified:
incubator/ooo/branches/gbuild/main/solenv/gbuild/JavaClassSet.mk
Modified: incubator/ooo/branches/gbuild/main/solenv/gbuild/JavaClassSet.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/solenv/gbuild/JavaClassSet.mk?rev=1409566&r1=1409565&r2=1409566&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/solenv/gbuild/JavaClassSet.mk (original)
+++ incubator/ooo/branches/gbuild/main/solenv/gbuild/JavaClassSet.mk Wed Nov 14
23:41:59 2012
@@ -74,13 +74,13 @@ endef
# build order dependency is a hack to get these prerequisites out of the way
in the build command
define gb_JavaClassSet_add_jar
$(eval $(call gb_JavaClassSet_get_target,$(1)) : $(2))
-$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH :=
$$(CLASSPATH)$(gb_CLASSPATHSEP)$(2))
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH :=
$$(CLASSPATH)$$(gb_CLASSPATHSEP)$(strip $(2)))
$(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2))
endef
# this does not generate dependency on the jar
define gb_JavaClassSet_add_system_jar
-$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH :=
$$(CLASSPATH)$(gb_CLASSPATHSEP)$(2))
+$(eval $(call gb_JavaClassSet_get_target,$(1)) : CLASSPATH :=
$$(CLASSPATH)$$(gb_CLASSPATHSEP)$(strip $(2)))
$(eval $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2))
endef
