diff options
| author | Kai Sommerfeld <kso@openoffice.org> | 2010-06-25 09:56:19 +0200 |
|---|---|---|
| committer | Kai Sommerfeld <kso@openoffice.org> | 2010-06-25 09:56:19 +0200 |
| commit | 32b60d0777e2420f9779af1771ac32ce8a7f9761 (patch) | |
| tree | 8b134dd0dde14ec32046979cdbcff11b5c03f2a6 /desktop/test | |
| parent | masterfix: #i10000# warning C4244: conversion from SbError to USHORT (diff) | |
| download | core-32b60d0777e2420f9779af1771ac32ce8a7f9761.tar.gz core-32b60d0777e2420f9779af1771ac32ce8a7f9761.zip | |
#i110653# - use ooo base version supplied by build env.
Diffstat (limited to 'desktop/test')
| -rw-r--r-- | desktop/test/deployment/boxt/makefile.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/desktop/test/deployment/boxt/makefile.mk b/desktop/test/deployment/boxt/makefile.mk index 63f123fcc608..11d736448d44 100644 --- a/desktop/test/deployment/boxt/makefile.mk +++ b/desktop/test/deployment/boxt/makefile.mk @@ -33,11 +33,9 @@ ENABLE_EXCEPTIONS = TRUE .INCLUDE: settings.mk .INCLUDE: rtlbootstrap.mk +.INCLUDE: versionlist.mk -#TODO: The underlying OOo base version needed here is currently only available -# as instsetoo_native/util/openoffice.lst OOOBASEVERSION, so hard-coding it here -# for now (see issue 110653): -my_version = 3.3 +my_version = $(OOOBASEVERSIONMAJOR).$(OOOBASEVERSIONMINOR) DLLPRE = |