diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-11-06 15:10:12 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-11-06 15:10:12 +0000 |
| commit | bec06feb29afb6fd49354125a2b56ed274aa67d6 (patch) | |
| tree | 4eefe5e5b99c34a54c8f6f24a7c6697655030456 | |
| parent | 0294fe84b30ac2565df7ecc59f9381c9bc4a0a3e (diff) | |
INTEGRATION: CWS execshellmacrogone (1.28.22); FILE MERGED
2007/10/24 08:34:04 rene 1.28.22.2: RESYNC: (1.28-1.29); FILE MERGED
2007/10/24 06:35:51 rene 1.28.22.1: #i79760# krs patches for supressing "Executing shell macro..." output
| -rw-r--r-- | testtools/source/bridgetest/makefile.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk index 8e5d077eeca9..a5c595c51ca8 100644 --- a/testtools/source/bridgetest/makefile.mk +++ b/testtools/source/bridgetest/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.31 $ +# $Revision: 1.32 $ # -# last change: $Author: rt $ $Date: 2007-11-05 09:53:07 $ +# last change: $Author: rt $ $Date: 2007-11-06 16:10:12 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -48,12 +48,12 @@ DLLPRE = # no leading "lib" on .so files .IF "$(GUI)"=="WNT" BATCH_SUFFIX=.bat GIVE_EXEC_RIGHTS=@echo -MY_URE_INTERNAL_JAVA_DIR=$(strip $(subst,\,/ file:///$(shell $(WRAPCMD) echo $(SOLARBINDIR)))) +MY_URE_INTERNAL_JAVA_DIR=$(strip $(subst,\,/ file:///$(shell @$(WRAPCMD) echo $(SOLARBINDIR)))) MY_LOCAL_CLASSDIR=$(strip $(subst,\,/ file:///$(shell $(WRAPCMD) echo $(PWD)$/$(CLASSDIR)))) .ELIF "$(GUI)"=="OS2" BATCH_SUFFIX=.cmd GIVE_EXEC_RIGHTS=@echo -MY_URE_INTERNAL_JAVA_DIR=$(strip $(subst,\,/ file:///$(shell $(WRAPCMD) echo $(SOLARBINDIR)))) +MY_URE_INTERNAL_JAVA_DIR=$(strip $(subst,\,/ file:///$(shell @$(WRAPCMD) echo $(SOLARBINDIR)))) MY_LOCAL_CLASSDIR=$(strip $(subst,\,/ file:///$(shell $(WRAPCMD) echo $(PWD)$/$(CLASSDIR)))) .ELSE BATCH_INPROCESS=bridgetest_inprocess |