INTEGRATION: CWS execshellmacrogone (1.3.26); FILE MERGED

2007/10/24 08:31:08 rene 1.3.26.2: RESYNC: (1.3-1.4); FILE MERGED
2007/10/24 06:35:38 rene 1.3.26.1: #i79760# krs patches for supressing "Executing shell macro..." output
This commit is contained in:
Rüdiger Timm
2007-11-06 14:38:25 +00:00
parent ac89d49e6b
commit d2697410ef

View File

@@ -4,9 +4,9 @@
# #
# $RCSfile: makefile.mk,v $ # $RCSfile: makefile.mk,v $
# #
# $Revision: 1.4 $ # $Revision: 1.5 $
# #
# last change: $Author: hr $ $Date: 2007-09-27 12:50:45 $ # last change: $Author: rt $ $Date: 2007-11-06 15:38:25 $
# #
# The Contents of this file are made available subject to # The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1. # the terms of GNU Lesser General Public License Version 2.1.
@@ -45,7 +45,7 @@ ENABLE_EXCEPTIONS := TRUE
.IF "$(GUI)" == "WNT" .IF "$(GUI)" == "WNT"
FILEURLPREFIX = file:/// FILEURLPREFIX = file:///
MY_URE_INTERNAL_JAVA_DIR=$(strip $(subst,\,/ file:///$(shell $(WRAPCMD) echo $(SOLARBINDIR)))) MY_URE_INTERNAL_JAVA_DIR=$(strip $(subst,\,/ file:///$(shell @$(WRAPCMD) echo $(SOLARBINDIR))))
.ELSE .ELSE
FILEURLPREFIX = file:// FILEURLPREFIX = file://
MY_URE_INTERNAL_JAVA_DIR=file://$(SOLARBINDIR) MY_URE_INTERNAL_JAVA_DIR=file://$(SOLARBINDIR)