diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-06 14:00:42 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-06 14:00:42 +0000 |
| commit | 2506aef1c5b538e28e121cee935d8da95b075511 (patch) | |
| tree | 85ab6f4590847f2dc7aff6d1808b41f011f9756a /sysui/desktop/slackware/makefile.mk | |
| parent | 8689a4f63c12a52222b3f3adfc1c3223fb000a44 (diff) | |
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
Diffstat (limited to 'sysui/desktop/slackware/makefile.mk')
| -rw-r--r-- | sysui/desktop/slackware/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sysui/desktop/slackware/makefile.mk b/sysui/desktop/slackware/makefile.mk index 27f6dc203144..db80978b7b38 100644 --- a/sysui/desktop/slackware/makefile.mk +++ b/sysui/desktop/slackware/makefile.mk @@ -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 |