diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-11-06 14:57:20 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-11-06 14:57:20 +0000 |
| commit | 6eb7c9e0bc25be184a8e805f9c2d1b2a2bc26b12 (patch) | |
| tree | 3314c2dbab3834e7ef0e3b33e0f387ef86585d19 /sysui/desktop/debian | |
| parent | f3aa676abcf4e25ee7a08eec6c3d0932a1defa42 (diff) | |
INTEGRATION: CWS execshellmacrogone (1.20.12); FILE MERGED
2007/10/24 08:42:25 rene 1.20.12.2: RESYNC: (1.20-1.22); FILE MERGED
2007/10/24 06:35:49 rene 1.20.12.1: #i79760# krs patches for supressing "Executing shell macro..." output
Diffstat (limited to 'sysui/desktop/debian')
| -rw-r--r-- | sysui/desktop/debian/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sysui/desktop/debian/makefile.mk b/sysui/desktop/debian/makefile.mk index 34a298bbdf9c..e57df9797a60 100644 --- a/sysui/desktop/debian/makefile.mk +++ b/sysui/desktop/debian/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.22 $ +# $Revision: 1.23 $ # -# last change: $Author: ihi $ $Date: 2007-08-20 14:08:41 $ +# last change: $Author: rt $ $Date: 2007-11-06 15:57:20 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -70,7 +70,7 @@ ALLTAR : $(DEBFILES) %/DEBIAN/control : $$(@:f) @$(MKDIRHIER) $(@:d) $*$/etc $*$/usr/share/applnk/Office $*$/usr/lib/menu ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1)) $*$/etc$/ - /bin/sh -c -x "cd $(COMMONMISC)$/$(*:f:s/-/ /:1) && DESTDIR=$(shell cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr GNOMEDIR=/usr create_tree.sh" + /bin/sh -c -x "cd $(COMMONMISC)$/$(*:f:s/-/ /:1) && DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr GNOMEDIR=/usr create_tree.sh" @cat openoffice.org-debian-menus | sed -e 's/%PRODUCTNAME/$(PRODUCTNAME.$(*:f:s/-/ /:1)) $(PRODUCTVERSION.$(*:f:s/-/ /:1))/' -e 's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1))/' -e 's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1))/' > $*$/usr/lib/menu/$(*:f:s/_/ /:1) echo "Package: $(*:f:s/_/ /:1)" > $@ cat $(@:f) | tr -d "\015" | sed "s/%productname/$(PRODUCTNAME.$(*:f:s/-/ /:1))/" >> $@ |