diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-05-15 08:12:16 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-05-15 08:12:16 +0000 |
| commit | 8fa24243f67a8564d6ba48854f8ee014ca499893 (patch) | |
| tree | 49d953d3caf46a062d2e72cbe0e2dbce1917bfc2 /sysui | |
| parent | 0797a7072cd2e641ecb5e1f0c2eb7fa6e024c6f0 (diff) | |
INTEGRATION: CWS oxtsysint01 (1.10.4); FILE MERGED
2008/04/24 13:33:12 obr 1.10.4.1: #i85856# desktop integration no longer uses unopkg gui
Diffstat (limited to 'sysui')
| -rw-r--r-- | sysui/desktop/slackware/makefile.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sysui/desktop/slackware/makefile.mk b/sysui/desktop/slackware/makefile.mk index 91a158510ac4..940a0f92f2b3 100644 --- a/sysui/desktop/slackware/makefile.mk +++ b/sysui/desktop/slackware/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # # This file is part of OpenOffice.org. # @@ -72,14 +72,13 @@ $(MISC)/$(TARGET)/usr/share/applications/ : $(RM) $*$/opt$/kde$/share$/mimelnk$/application$/*-extension.desktop $(RM) $*$/usr$/share$/applications$/*.desktop $(RM) $*$/usr$/bin$/soffice - $(RM) $*$/usr$/bin$/unopkg %$/install$/doinst.sh : update-script @echo "( cd etc ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.0//)) )" > $@ @echo "( cd etc ; ln -snf /opt/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.0//):s/-//) $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.0//)) )" >> $@ @echo "( cd usr/bin ; rm -rf soffice )" >> $@ @echo "( cd usr/bin ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.0//))/program/soffice soffice )" >> $@ - @echo $(ECHOPARAM) $(foreach,i,$(shell @sed 's/extensionmgr.desktop//' $(COMMONMISC)$/$(*:b:s/-/ /:1:s/3.0//)/launcherlist) "\n( cd usr/share/applications ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.0//))-$i )\n( cd usr/share/applications ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.0//))/share/xdg/$i $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.0//))-$i )") >> $@ + @echo $(ECHOPARAM) $(foreach,i,$(shell @cat $(COMMONMISC)$/$(*:b:s/-/ /:1:s/3.0//)/launcherlist) "\n( cd usr/share/applications ; rm -rf $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.0//))-$i )\n( cd usr/share/applications ; ln -sf /etc/$(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.0//))/share/xdg/$i $(UNIXFILENAME.$(*:b:s/-/ /:1:s/3.0//))-$i )") >> $@ @cat $< >> $@ %$/install$/slack-desc : slack-desc |