diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-01-13 13:56:43 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-01-13 13:56:43 +0000 |
| commit | d36b9f6419fea1cf8593e652f59c273c4c8a4184 (patch) | |
| tree | 4c27ca04dafc6a2db08b025bab2ac5462d164034 /sysui/desktop | |
| parent | b8eb2a8a247b023b00b624b9a8aed64622c29241 (diff) | |
INTEGRATION: CWS sysui12 (1.8.2); FILE MERGED
2006/01/09 10:06:22 obr 1.8.2.6: RESYNC: (1.10-1.11); FILE MERGED
2005/12/19 14:12:11 obr 1.8.2.5: RESYNC: (1.9-1.10); FILE MERGED
2005/11/23 12:28:13 obr 1.8.2.4: #i46964# replaced _build_name_fmt with _rpmfilename in rpm options
2005/11/07 10:24:51 obr 1.8.2.3: RESYNC: (1.8-1.9); FILE MERGED
2005/10/11 11:53:54 obr 1.8.2.2: #i54236# fixed parallel build problem (hopefully)
2005/10/06 10:00:15 obr 1.8.2.1: #i46964# deliver desktop integration packages in version independant tgz
Diffstat (limited to 'sysui/desktop')
| -rw-r--r-- | sysui/desktop/productversion.mk | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk index 03aba1a56195..2871c0ecd224 100644 --- a/sysui/desktop/productversion.mk +++ b/sysui/desktop/productversion.mk @@ -4,9 +4,9 @@ # # $RCSfile: productversion.mk,v $ # -# $Revision: 1.11 $ +# $Revision: 1.12 $ # -# last change: $Author: kz $ $Date: 2006-01-06 11:17:26 $ +# last change: $Author: rt $ $Date: 2006-01-13 14:56:43 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -39,3 +39,16 @@ LONGPRODUCTNAME = OpenOffice.org 2.0 UNIXFILENAME = openoffice.org-2.0 PKGVERSION = 2.0.2 PKGREV = $(LAST_MINOR:s/m//:s/s/./) + +ABSLOCALOUT:=$(shell +cd $(PRJ) && pwd)$/$(ROUT) + +# create desktop-integration subfolder on linux +.IF "$(OS)"=="LINUX" +# rpm seems to require absolute paths here :( +PKGDIR:=$(ABSLOCALOUT)$/bin$/desktop-integration +RPMMACROS= \ + --define "_rpmdir $(PKGDIR)" \ + --define "_rpmfilename %%{{NAME}}-%%{{VERSION}}-%%{{RELEASE}}.%%{{ARCH}}.rpm" +.ELSE +PKGDIR=$(BIN) +.ENDIF |