Skip to content

C
core
Kaydet (Commit) 74bd1f57 authored tarafından Peter Foley's avatar Peter Foley
Dosyalara gözat
Seçenekler

get version from AC_PACKAGE_VERSION instead of files in solenv/inc

üst 09046cb6
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 12 deletions
configure.in
Dosyayı görüntüle @ 74bd1f57
...@@ -2112,9 +2112,7 @@ if test "$cross_compiling" = "yes"; then ...@@ -2112,9 +2112,7 @@ if test "$cross_compiling" = "yes"; then
post_download.in \ post_download.in \
set_soenv.in \ set_soenv.in \
solenv/inc/langlist.mk \ solenv/inc/langlist.mk \
solenv/inc/minor.mk \
solenv/inc/postset.mk \ solenv/inc/postset.mk \
solenv/inc/productversion.mk \
desktop/scripts/soffice.sh.in \ desktop/scripts/soffice.sh.in \
| (cd CONF-FOR-BUILD && tar xf -) | (cd CONF-FOR-BUILD && tar xf -)
( (
...@@ -2191,15 +2189,10 @@ AC_SUBST(SOLARINC_FOR_BUILD) ...@@ -2191,15 +2189,10 @@ AC_SUBST(SOLARINC_FOR_BUILD)
AC_SUBST(SOLARLIB_FOR_BUILD) AC_SUBST(SOLARLIB_FOR_BUILD)
AC_SUBST(WORKDIR_FOR_BUILD) AC_SUBST(WORKDIR_FOR_BUILD)
if test -e solenv/inc/minor.mk; then UPD="`echo AC_PACKAGE_VERSION | sed "s/\.//"`0"
# Get UPD number from ./solenv/inc/minor.mk SOURCEVERSION="OOO$UPD"
UPD="`grep RSCVERSION= solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`" AC_SUBST(UPD)
AC_SUBST(UPD) AC_SUBST(SOURCEVERSION)
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
dnl =================================================================== dnl ===================================================================
dnl Set the ENABLE_CRASHDUMP variable. dnl Set the ENABLE_CRASHDUMP variable.
...@@ -9025,7 +9018,7 @@ dnl =================================================================== ...@@ -9025,7 +9018,7 @@ dnl ===================================================================
dnl Product version dnl Product version
dnl =================================================================== dnl ===================================================================
AC_MSG_CHECKING([for product version]) 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_MSG_RESULT([$PRODUCTVERSION])
AC_SUBST(PRODUCTVERSION) AC_SUBST(PRODUCTVERSION)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment