diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-09-02 10:52:10 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-09-02 10:52:10 +0000 |
| commit | 6c53e54d25f0bea4183e3e4121390d80050bdb5a (patch) | |
| tree | 3ecd7c1c994db5891e5ffaec8951e1ddcc950bb6 /sysui/desktop | |
| parent | 52da1c9f9c6ddc2704c0e45bada042d74a5628ab (diff) | |
INTEGRATION: CWS sysui30_DEV300 (1.27.36); FILE MERGED
2008/08/27 12:40:37 ihi 1.27.36.1: #i92874# 3-layer-office fix
Diffstat (limited to 'sysui/desktop')
| -rw-r--r-- | sysui/desktop/productversion.mk | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk index 357dbe8074e1..219f5d17b9f1 100644 --- a/sysui/desktop/productversion.mk +++ b/sysui/desktop/productversion.mk @@ -8,7 +8,7 @@ # # $RCSfile: productversion.mk,v $ # -# $Revision: 1.27 $ +# $Revision: 1.28 $ # # This file is part of OpenOffice.org. # @@ -51,29 +51,32 @@ PRODUCTLIST = openoffice.org broffice.org # default values to minimize maintainance effort PRODUCTVERSION = 3.0 +PRODUCTVERSIONSHORT = 3 PKGVERSION = $(PRODUCTVERSION) # gnome-vfs treats everything behind the last '.' as an icon extension, # even though the "icon_filename" in '.keys' is specified as filename # without extension. Since it also does not know how to handle "2-writer" # type icons :-), we are stripping all '.' for now. # ToDo: maybe we use a product major later ?? -ICONVERSION = $(PRODUCTVERSION:s/.//g) +ICONVERSION = $(PRODUCTVERSIONSHORT:s/.//g) # UNIXWRAPPERNAME variable is used to generate the common desktop files below share/xdg; # the default values get replaced by make_installer.pl at (core0x) packaging time; # another wrapper name can be forced by --with-unix-wrapper configure option # which is need by other distributors, see http://www.openoffice.org/issues/show_bug.cgi?id=75366 -UNIXWRAPPERNAME *= '$${{UNIXPRODUCTNAME}}$${{PRODUCTVERSION}}' +UNIXWRAPPERNAME *= '$${{UNIXPRODUCTNAME}}$${{BRANDPACKAGEVERSION}}' PRODUCTNAME.openoffice.org = OpenOffice.org PRODUCTVERSION.openoffice.org = $(PRODUCTVERSION) +PRODUCTVERSIONSHORT.openoffice.org = $(PRODUCTVERSIONSHORT) PKGVERSION.openoffice.org = $(PKGVERSION) -UNIXFILENAME.openoffice.org = $(PRODUCTNAME.openoffice.org:l)$(PRODUCTVERSION.openoffice.org) +UNIXFILENAME.openoffice.org = $(PRODUCTNAME.openoffice.org:l)$(PRODUCTVERSIONSHORT.openoffice.org) ICONPREFIX.openoffice.org = $(UNIXFILENAME.openoffice.org:s/.//g) PRODUCTNAME.broffice.org = BrOffice.org PRODUCTVERSION.broffice.org = $(PRODUCTVERSION) +PRODUCTVERSIONSHORT.broffice.org = $(PRODUCTVERSIONSHORT) PKGVERSION.broffice.org = $(PKGVERSION) -UNIXFILENAME.broffice.org = $(PRODUCTNAME.broffice.org:l)$(PRODUCTVERSION.broffice.org) +UNIXFILENAME.broffice.org = $(PRODUCTNAME.broffice.org:l)$(PRODUCTVERSIONSHORT.broffice.org) ICONPREFIX.broffice.org = $(UNIXFILENAME.broffice.org:s/.//g) |