INTEGRATION: CWS execshellmacrogone (1.20.12); FILE MERGED

2007/10/24 08:42:28 rene 1.20.12.2: RESYNC: (1.20-1.21); FILE MERGED
2007/10/24 06:35:49 rene 1.20.12.1: #i79760# krs patches for supressing "Executing shell macro..." output
This commit is contained in:
Rüdiger Timm 2007-11-06 14:57:36 +00:00
parent 6eb7c9e0bc
commit ebfaa37bb3

View file

@ -4,9 +4,9 @@
# #
# $RCSfile: makefile.mk,v $ # $RCSfile: makefile.mk,v $
# #
# $Revision: 1.21 $ # $Revision: 1.22 $
# #
# last change: $Author: vg $ $Date: 2007-08-30 13:16:06 $ # last change: $Author: rt $ $Date: 2007-11-06 15:57:36 $
# #
# 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.
@ -151,7 +151,7 @@ $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN)
@$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH) --ext "desktop" --key "GenericName" $(ULFDIR)$/launcher_genericname.ulf @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d $(@:db).$(INPATH) --ext "desktop" --key "GenericName" $(ULFDIR)$/launcher_genericname.ulf
.IF "$(WITH_LIBSN)"=="YES" .IF "$(WITH_LIBSN)"=="YES"
@noop x$(foreach,i,$(LAUNCHERLIST) $(shell echo "StartupNotify=true" >> $(@:db).$(INPATH)/$i.desktop))x @noop x$(foreach,i,$(LAUNCHERLIST) $(shell @echo "StartupNotify=true" >> $(@:db).$(INPATH)/$i.desktop))x
.ENDIF .ENDIF
@$(MV) -f $(@:db).$(INPATH)/* $(@:d) @$(MV) -f $(@:db).$(INPATH)/* $(@:d)
@rmdir $(@:db).$(INPATH) @rmdir $(@:db).$(INPATH)