diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-02-12 12:30:58 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-02-12 12:30:58 +0000 |
| commit | 27cee73d9ac5eb72d36726d984d2d1bc2f2a4e08 (patch) | |
| tree | 8bbd068fc04fdf002b7143a6f1ff8be303c0b2da /sysui | |
| parent | 9b6f7bf20eff50b3b552941171f0a92d1538ff2b (diff) | |
INTEGRATION: CWS obr07 (1.6.14); FILE MERGED
2008/02/03 20:55:22 obr 1.6.14.1: #i84571# applied latest patch
Diffstat (limited to 'sysui')
| -rw-r--r-- | sysui/desktop/slackware/makefile.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sysui/desktop/slackware/makefile.mk b/sysui/desktop/slackware/makefile.mk index 70ebb2ccc61a..27f6dc203144 100644 --- a/sysui/desktop/slackware/makefile.mk +++ b/sysui/desktop/slackware/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: rt $ $Date: 2007-11-06 15:57:49 $ +# last change: $Author: vg $ $Date: 2008-02-12 13:30:58 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -50,6 +50,10 @@ TARGET=slackware MENUFILES=$(PKGDIR)$/{$(PRODUCTLIST)}-$(TARGET)-menus-$(PKGVERSION)-noarch-$(PKGREV).tgz +.IF "$(USE_SHELL)"=="bash" +ECHOPARAM=-e +.ENDIF + # --- Targets ------------------------------------------------------- .INCLUDE : target.mk @@ -79,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 $(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/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 )") >> $@ @cat $< >> $@ %$/install$/slack-desc : slack-desc |