diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-11-06 14:47:03 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-11-06 14:47:03 +0000 |
| commit | 6eb05fb8dceb9e8705dff8a25fc18e797b9bca98 (patch) | |
| tree | 5cce316134374b2c3e14ec2b61e9c732fd440cc5 | |
| parent | 7142c9db14e348b011c4b3ce44e4d2242b04ac9e (diff) | |
INTEGRATION: CWS execshellmacrogone (1.36.208); FILE MERGED
2007/10/24 06:35:48 rene 1.36.208.1: #i79760# krs patches for supressing "Executing shell macro..." output
| -rw-r--r-- | solenv/inc/tg_zip.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/inc/tg_zip.mk b/solenv/inc/tg_zip.mk index 9dbbefd66853..5b2dc3feb6a3 100644 --- a/solenv/inc/tg_zip.mk +++ b/solenv/inc/tg_zip.mk @@ -4,9 +4,9 @@ # # $RCSfile: tg_zip.mk,v $ # -# $Revision: 1.36 $ +# $Revision: 1.37 $ # -# last change: $Author: hjs $ $Date: 2007-05-10 14:21:58 $ +# last change: $Author: rt $ $Date: 2007-11-06 15:47:03 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -70,7 +70,7 @@ ZIP$(TNR)FLAGS*=$(ZIPFLAGS) zip$(TNR)langdirs*=$(alllangiso) .ELSE # "$(zip$(TNR)generatedlangs)"!="" .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -zip$(TNR)langdirs:=$(shell -test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP$(TNR)DIR) . $(ZIP$(TNR)DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP$(TNR)DIR) . $(ZIP$(TNR)DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) +zip$(TNR)langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP$(TNR)DIR) . $(ZIP$(TNR)DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP$(TNR)DIR) . $(ZIP$(TNR)DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) .ELSE # "$(GUI)"=="UNX" zip$(TNR)langdirs:=$(subst,CVS, $(shell $(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP$(TNR)DIR))} /ba:d )) .ENDIF # "$(GUI)"=="UNX" |