diff options
Diffstat (limited to 'sysui/desktop/productversion.mk')
| -rwxr-xr-x[-rw-r--r--] | sysui/desktop/productversion.mk | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk index 09141b2276bd..6f41333370dc 100644..100755 --- a/sysui/desktop/productversion.mk +++ b/sysui/desktop/productversion.mk @@ -33,7 +33,7 @@ PKGREV = $(LAST_MINOR:s/m//:s/s/./) ABSLOCALOUT:=$(shell @cd $(PRJ) && pwd)$/$(ROUT) # create desktop-integration subfolder on linux -.IF "$(OS)"=="LINUX" +.IF "$(OS)"=="LINUX" || "$(OS)"=="AIX" # rpm seems to require absolute paths here :( PKGDIR:=$(ABSLOCALOUT)$/bin$/desktop-integration RPMMACROS= \ @@ -43,11 +43,8 @@ RPMMACROS= \ PKGDIR=$(BIN) .ENDIF -PRODUCTLIST = openoffice.org broffice.org +.INCLUDE : productversion.mk -# default values to minimize maintainance effort -PRODUCTVERSION = 3.4 -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 @@ -61,18 +58,18 @@ ICONVERSION = $(PRODUCTVERSIONSHORT:s/.//g) # which is need by other distributors, see http://www.openoffice.org/issues/show_bug.cgi?id=75366 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)$(PRODUCTVERSIONSHORT.openoffice.org) -ICONPREFIX.openoffice.org = $(UNIXFILENAME.openoffice.org:s/.//g) +PRODUCTNAME.libreoffice = LibreOffice +PRODUCTVERSION.libreoffice = $(PRODUCTVERSION) +PRODUCTVERSIONSHORT.libreoffice = $(PRODUCTVERSIONSHORT) +PKGVERSION.libreoffice = $(PKGVERSION) +UNIXFILENAME.libreoffice = $(PRODUCTNAME.libreoffice:l) +ICONPREFIX.libreoffice = $(UNIXFILENAME.libreoffice: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)$(PRODUCTVERSIONSHORT.broffice.org) -ICONPREFIX.broffice.org = $(UNIXFILENAME.broffice.org:s/.//g) +PRODUCTNAME.broffice = BrOffice +PRODUCTVERSION.broffice = $(PRODUCTVERSION) +PRODUCTVERSIONSHORT.broffice = $(PRODUCTVERSIONSHORT) +PKGVERSION.broffice = $(PKGVERSION) +UNIXFILENAME.broffice = $(PRODUCTNAME.broffice:l) +ICONPREFIX.broffice = $(UNIXFILENAME.broffice:s/.//g) |