INTEGRATION: CWS ause084_DEV300 (1.7.2); FILE MERGED
2008/02/21 10:58:16 hjs 1.7.2.1: #i74563# avoid identical names; remove unused icons
This commit is contained in:
parent
8689a4f63c
commit
2506aef1c5
1 changed files with 3 additions and 3 deletions
|
@ -4,9 +4,9 @@
|
|||
#
|
||||
# $RCSfile: makefile.mk,v $
|
||||
#
|
||||
# $Revision: 1.7 $
|
||||
# $Revision: 1.8 $
|
||||
#
|
||||
# last change: $Author: vg $ $Date: 2008-02-12 13:30:58 $
|
||||
# last change: $Author: kz $ $Date: 2008-03-06 15:00:42 $
|
||||
#
|
||||
# The Contents of this file are made available subject to
|
||||
# the terms of GNU Lesser General Public License Version 2.1.
|
||||
|
@ -83,7 +83,7 @@ $(MISC)/$(TARGET)/usr/share/applications/ :
|
|||
@echo "( cd etc ; ln -snf /opt/$(UNIXFILENAME.$(*:b:s/-/ /:1):s/-//) $(UNIXFILENAME.$(*:b:s/-/ /:1)) )" >> $@
|
||||
@echo "( cd usr/bin ; rm -rf soffice )" >> $@
|
||||
@echo "( cd usr/bin ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1))/program/soffice soffice )" >> $@
|
||||
@echo $(ECHOPARAM) $(foreach,i,$(shell @sed 's/extension.desktop//' $(COMMONMISC)$/$(*:b:s/-/ /:1)/launcherlist) "\n( cd usr/share/applications ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1))-$i )\n( cd usr/share/applications ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1))/share/xdg/$i $(UNIXFILENAME.$(*:b:s/-/ /:1))-$i )") >> $@
|
||||
@echo $(ECHOPARAM) $(foreach,i,$(shell @sed 's/extensionmgr.desktop//' $(COMMONMISC)$/$(*:b:s/-/ /:1)/launcherlist) "\n( cd usr/share/applications ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1))-$i )\n( cd usr/share/applications ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1))/share/xdg/$i $(UNIXFILENAME.$(*:b:s/-/ /:1))-$i )") >> $@
|
||||
@cat $< >> $@
|
||||
|
||||
%$/install$/slack-desc : slack-desc
|
||||
|
|
Loading…
Reference in a new issue