diff options
| author | Peter Foley <pefoley2@verizon.net> | 2011-09-25 19:03:02 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2011-10-01 18:34:45 -0400 |
| commit | 74bd1f57b56918a3ef5f27aa2565397a4c6e85e1 (patch) | |
| tree | f1a14918995e6f79db25b56dae0039621a40f6e8 /configure.in | |
| parent | 09046cb6c040e836c0041c18b617559cd0e21df7 (diff) | |
get version from AC_PACKAGE_VERSION instead of files in solenv/inc
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/configure.in b/configure.in index e49b885e21b5..b141f65f9552 100644 --- a/configure.in +++ b/configure.in @@ -2112,9 +2112,7 @@ if test "$cross_compiling" = "yes"; then post_download.in \ set_soenv.in \ solenv/inc/langlist.mk \ - solenv/inc/minor.mk \ solenv/inc/postset.mk \ - solenv/inc/productversion.mk \ desktop/scripts/soffice.sh.in \ | (cd CONF-FOR-BUILD && tar xf -) ( @@ -2191,15 +2189,10 @@ AC_SUBST(SOLARINC_FOR_BUILD) AC_SUBST(SOLARLIB_FOR_BUILD) AC_SUBST(WORKDIR_FOR_BUILD) -if test -e solenv/inc/minor.mk; then - # Get UPD number from ./solenv/inc/minor.mk - UPD="`grep RSCVERSION= solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`" - AC_SUBST(UPD) - SOURCEVERSION="`grep SOURCEVERSION= solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`" - AC_SUBST(SOURCEVERSION) -else - AC_MSG_ERROR([solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation...]) -fi +UPD="`echo AC_PACKAGE_VERSION | sed "s/\.//"`0" +SOURCEVERSION="OOO$UPD" +AC_SUBST(UPD) +AC_SUBST(SOURCEVERSION) dnl =================================================================== dnl Set the ENABLE_CRASHDUMP variable. @@ -9025,7 +9018,7 @@ dnl =================================================================== dnl Product version dnl =================================================================== AC_MSG_CHECKING([for product version]) -[eval $(sed -n -e 's/ //g' -e '/PRODUCTVERSION=/p' solenv/inc/productversion.mk)] +PRODUCTVERSION=AC_PACKAGE_VERSION AC_MSG_RESULT([$PRODUCTVERSION]) AC_SUBST(PRODUCTVERSION) |