diff options
author | Rüdiger Timm <rt@openoffice.org> | 2007-11-06 14:43:53 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2007-11-06 14:43:53 +0000 |
commit | 303a243532668ad4a32799d0d104b880ab37d910 (patch) | |
tree | 2a46d53e93f2dd688a730f4bf0e99d3e809a9e07 /solenv/inc/_tg_zip.mk | |
parent | 88bf69fcc542d6e98721765355f2c2ae56706ed8 (diff) |
INTEGRATION: CWS execshellmacrogone (1.33.208); FILE MERGED
2007/10/24 06:35:44 rene 1.33.208.1: #i79760# krs patches for supressing "Executing shell macro..." output
Diffstat (limited to 'solenv/inc/_tg_zip.mk')
-rw-r--r-- | solenv/inc/_tg_zip.mk | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/solenv/inc/_tg_zip.mk b/solenv/inc/_tg_zip.mk index eb80e5989d37..d715ddb99107 100644 --- a/solenv/inc/_tg_zip.mk +++ b/solenv/inc/_tg_zip.mk @@ -34,9 +34,9 @@ ZIP1FLAGS*=$(ZIPFLAGS) zip1langdirs*=$(alllangiso) .ELSE # "$(zip1generatedlangs)"!="" .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -zip1langdirs:=$(shell -test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP1DIR) . $(ZIP1DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP1DIR) . $(ZIP1DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) +zip1langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP1DIR) . $(ZIP1DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP1DIR) . $(ZIP1DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) .ELSE # "$(GUI)"=="UNX" -zip1langdirs:=$(subst,CVS, $(shell $(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP1DIR))} /ba:d )) +zip1langdirs:=$(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP1DIR))} /ba:d )) .ENDIF # "$(GUI)"=="UNX" .ENDIF # "$(zip1generatedlangs)"!="" .IF "$(ZIP1FORCEALLLANG)"!="" @@ -159,9 +159,9 @@ ZIP2FLAGS*=$(ZIPFLAGS) zip2langdirs*=$(alllangiso) .ELSE # "$(zip2generatedlangs)"!="" .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -zip2langdirs:=$(shell -test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP2DIR) . $(ZIP2DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP2DIR) . $(ZIP2DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) +zip2langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP2DIR) . $(ZIP2DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP2DIR) . $(ZIP2DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) .ELSE # "$(GUI)"=="UNX" -zip2langdirs:=$(subst,CVS, $(shell $(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP2DIR))} /ba:d )) +zip2langdirs:=$(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP2DIR))} /ba:d )) .ENDIF # "$(GUI)"=="UNX" .ENDIF # "$(zip2generatedlangs)"!="" .IF "$(ZIP2FORCEALLLANG)"!="" @@ -284,9 +284,9 @@ ZIP3FLAGS*=$(ZIPFLAGS) zip3langdirs*=$(alllangiso) .ELSE # "$(zip3generatedlangs)"!="" .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -zip3langdirs:=$(shell -test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP3DIR) . $(ZIP3DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP3DIR) . $(ZIP3DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) +zip3langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP3DIR) . $(ZIP3DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP3DIR) . $(ZIP3DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) .ELSE # "$(GUI)"=="UNX" -zip3langdirs:=$(subst,CVS, $(shell $(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP3DIR))} /ba:d )) +zip3langdirs:=$(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP3DIR))} /ba:d )) .ENDIF # "$(GUI)"=="UNX" .ENDIF # "$(zip3generatedlangs)"!="" .IF "$(ZIP3FORCEALLLANG)"!="" @@ -409,9 +409,9 @@ ZIP4FLAGS*=$(ZIPFLAGS) zip4langdirs*=$(alllangiso) .ELSE # "$(zip4generatedlangs)"!="" .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -zip4langdirs:=$(shell -test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP4DIR) . $(ZIP4DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP4DIR) . $(ZIP4DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) +zip4langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP4DIR) . $(ZIP4DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP4DIR) . $(ZIP4DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) .ELSE # "$(GUI)"=="UNX" -zip4langdirs:=$(subst,CVS, $(shell $(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP4DIR))} /ba:d )) +zip4langdirs:=$(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP4DIR))} /ba:d )) .ENDIF # "$(GUI)"=="UNX" .ENDIF # "$(zip4generatedlangs)"!="" .IF "$(ZIP4FORCEALLLANG)"!="" @@ -534,9 +534,9 @@ ZIP5FLAGS*=$(ZIPFLAGS) zip5langdirs*=$(alllangiso) .ELSE # "$(zip5generatedlangs)"!="" .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -zip5langdirs:=$(shell -test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP5DIR) . $(ZIP5DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP5DIR) . $(ZIP5DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) +zip5langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP5DIR) . $(ZIP5DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP5DIR) . $(ZIP5DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) .ELSE # "$(GUI)"=="UNX" -zip5langdirs:=$(subst,CVS, $(shell $(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP5DIR))} /ba:d )) +zip5langdirs:=$(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP5DIR))} /ba:d )) .ENDIF # "$(GUI)"=="UNX" .ENDIF # "$(zip5generatedlangs)"!="" .IF "$(ZIP5FORCEALLLANG)"!="" @@ -659,9 +659,9 @@ ZIP6FLAGS*=$(ZIPFLAGS) zip6langdirs*=$(alllangiso) .ELSE # "$(zip6generatedlangs)"!="" .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -zip6langdirs:=$(shell -test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP6DIR) . $(ZIP6DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP6DIR) . $(ZIP6DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) +zip6langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP6DIR) . $(ZIP6DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP6DIR) . $(ZIP6DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) .ELSE # "$(GUI)"=="UNX" -zip6langdirs:=$(subst,CVS, $(shell $(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP6DIR))} /ba:d )) +zip6langdirs:=$(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP6DIR))} /ba:d )) .ENDIF # "$(GUI)"=="UNX" .ENDIF # "$(zip6generatedlangs)"!="" .IF "$(ZIP6FORCEALLLANG)"!="" @@ -784,9 +784,9 @@ ZIP7FLAGS*=$(ZIPFLAGS) zip7langdirs*=$(alllangiso) .ELSE # "$(zip7generatedlangs)"!="" .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -zip7langdirs:=$(shell -test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP7DIR) . $(ZIP7DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP7DIR) . $(ZIP7DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) +zip7langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP7DIR) . $(ZIP7DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP7DIR) . $(ZIP7DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) .ELSE # "$(GUI)"=="UNX" -zip7langdirs:=$(subst,CVS, $(shell $(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP7DIR))} /ba:d )) +zip7langdirs:=$(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP7DIR))} /ba:d )) .ENDIF # "$(GUI)"=="UNX" .ENDIF # "$(zip7generatedlangs)"!="" .IF "$(ZIP7FORCEALLLANG)"!="" @@ -909,9 +909,9 @@ ZIP8FLAGS*=$(ZIPFLAGS) zip8langdirs*=$(alllangiso) .ELSE # "$(zip8generatedlangs)"!="" .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -zip8langdirs:=$(shell -test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP8DIR) . $(ZIP8DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP8DIR) . $(ZIP8DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) +zip8langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP8DIR) . $(ZIP8DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP8DIR) . $(ZIP8DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) .ELSE # "$(GUI)"=="UNX" -zip8langdirs:=$(subst,CVS, $(shell $(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP8DIR))} /ba:d )) +zip8langdirs:=$(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP8DIR))} /ba:d )) .ENDIF # "$(GUI)"=="UNX" .ENDIF # "$(zip8generatedlangs)"!="" .IF "$(ZIP8FORCEALLLANG)"!="" @@ -1034,9 +1034,9 @@ ZIP9FLAGS*=$(ZIPFLAGS) zip9langdirs*=$(alllangiso) .ELSE # "$(zip9generatedlangs)"!="" .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -zip9langdirs:=$(shell -test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP9DIR) . $(ZIP9DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP9DIR) . $(ZIP9DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) +zip9langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP9DIR) . $(ZIP9DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP9DIR) . $(ZIP9DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) .ELSE # "$(GUI)"=="UNX" -zip9langdirs:=$(subst,CVS, $(shell $(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP9DIR))} /ba:d )) +zip9langdirs:=$(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP9DIR))} /ba:d )) .ENDIF # "$(GUI)"=="UNX" .ENDIF # "$(zip9generatedlangs)"!="" .IF "$(ZIP9FORCEALLLANG)"!="" @@ -1159,9 +1159,9 @@ ZIP10FLAGS*=$(ZIPFLAGS) zip10langdirs*=$(alllangiso) .ELSE # "$(zip10generatedlangs)"!="" .IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -zip10langdirs:=$(shell -test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP10DIR) . $(ZIP10DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP10DIR) . $(ZIP10DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) +zip10langdirs:=$(shell @-test -d {$(subst,$/$(LANGDIR), $(null,$(ZIP10DIR) . $(ZIP10DIR)))}/ && find {$(subst,$/$(LANGDIR), $(null,$(ZIP10DIR) . $(ZIP10DIR)))}/ -type d ! -name CVS ! -name "." | sed "s/\.\/\///" | sed "s/\.\///" ) .ELSE # "$(GUI)"=="UNX" -zip10langdirs:=$(subst,CVS, $(shell $(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP10DIR))} /ba:d )) +zip10langdirs:=$(subst,CVS, $(shell @$(4nt_force_shell)-dir {$(subst,$/$(LANGDIR), $(ZIP10DIR))} /ba:d )) .ENDIF # "$(GUI)"=="UNX" .ENDIF # "$(zip10generatedlangs)"!="" .IF "$(ZIP10FORCEALLLANG)"!="" |