summaryrefslogtreecommitdiff
path: root/sysui/desktop/productversion.mk
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2010-10-13 15:33:44 +0100
committerCaolán McNamara <caolanm@redhat.com>2010-10-13 20:30:55 +0100
commit84436b56885b80315964d98be9bf01d8a4a5ba8f (patch)
treee273dd7f13327645dc6216a5300c773fc8ee0de7 /sysui/desktop/productversion.mk
parent3317f535d107643e88209ae6925ebfd8da09893f (diff)
tweaks for AIX
Diffstat (limited to 'sysui/desktop/productversion.mk')
-rw-r--r--sysui/desktop/productversion.mk7
1 files changed, 2 insertions, 5 deletions
diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk
index c957ea844f36..fb8570b36b37 100644
--- 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 = libreoffice broffice.org
+.INCLUDE : productversion.mk
-# default values to minimize maintainance effort
-PRODUCTVERSION = 3.3
-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