diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-10-13 08:27:25 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-10-13 08:27:25 +0000 |
| commit | 474c21db30a76c359e85926edd48acea5a8eec02 (patch) | |
| tree | 18d77a014823f55fb0695cf600c5251c55199b3a /sysui/desktop | |
| parent | 460e3a7d1bd086b1341010d58010a577f5979bc9 (diff) | |
INTEGRATION: CWS merge20to201v2 (1.7.14); FILE MERGED
2005/10/07 14:03:13 hr 1.7.14.1: #i55617: merge OOO680 CWS ooo20m1
Diffstat (limited to 'sysui/desktop')
| -rw-r--r-- | sysui/desktop/debian/makefile.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sysui/desktop/debian/makefile.mk b/sysui/desktop/debian/makefile.mk index 7c59d6d9a169..db79d3f81cb0 100644 --- a/sysui/desktop/debian/makefile.mk +++ b/sysui/desktop/debian/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: rt $ $Date: 2005-09-09 11:46:40 $ +# last change: $Author: obo $ $Date: 2005-10-13 09:27:25 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -172,8 +172,8 @@ ALLTAR : $(DEBFILE) %/menu/$(PKGNAME) : $$(@:f) @$(MKDIRHIER) $(@:d) - @cat $< | sed -e 's/%PRODUCTNAME/$(LONGPRODUCTNAME)/' -e 's/%PREFIX/%unixfilename/' \ - -e 's/%ICONPREFIX/%unixfilename/' > $@ + @cat $< | sed -e 's/%PRODUCTNAME/$(LONGPRODUCTNAME)/' -e 's/%PREFIX/$(UNIXFILENAME)/' \ + -e 's/%ICONPREFIX/$(ICONPREFIX)/' > $@ # --- icons -------------------------------------------------------- @@ -241,7 +241,7 @@ $(MISC)/$(TARGET)/$(DEBFILE:f)/usr/bin/soffice : $(MISC)/$(TARGET)/$(DEBFILE:f)/etc/$(UNIXFILENAME) : @$(MKDIRHIER) $(@:d) - @ln -sf /opt/openoffice.org$(PKGVERSION) $@ + @ln -sf /opt/openoffice.org$(PRODUCTVERSION) $@ |