Download as
Browse Code »

Commit d92a3a5daa88fd76c83a8022d8f78f642aea0178

Authored by perry.werneck@gmail.com
1 parent 1af9776f
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Melhorando detecção do sdk libreoffice

Showing 1 changed file with 14 additions and 2 deletions   Show diff stats
@@ -429,7 +429,11 @@ AC_ARG_VAR([OO_SDK_HOME], [Libreoffice SDK home]) @@ -429,7 +429,11 @@ AC_ARG_VAR([OO_SDK_HOME], [Libreoffice SDK home])
429 AC_ARG_VAR([OO_SDK_URE_HOME], [Libreoffice URE home]) 429 AC_ARG_VAR([OO_SDK_URE_HOME], [Libreoffice URE home])
430 430
431 if test "_$OFFICE_HOME" == "_" ; then 431 if test "_$OFFICE_HOME" == "_" ; then
432 - OFFICE_HOME=$libdir/libreoffice 432 + if test "$host_cpu" = "x86_64"; then
  433 + OFFICE_HOME="/usr/lib64/libreoffice"
  434 + else
  435 + OFFICE_HOME="/usr/lib/libreoffice"
  436 + fi
433 fi 437 fi
434 438
435 if test "_$OO_SDK_HOME" == "_" ; then 439 if test "_$OO_SDK_HOME" == "_" ; then
@@ -437,7 +441,15 @@ if test "_$OO_SDK_HOME" == "_" ; then @@ -437,7 +441,15 @@ if test "_$OO_SDK_HOME" == "_" ; then
437 fi 441 fi
438 442
439 if test "_$OO_SDK_URE_HOME" == "_" ; then 443 if test "_$OO_SDK_URE_HOME" == "_" ; then
440 - OO_SDK_URE_HOME=$libdir/ure 444 + if test -d $OFFICE_HOME/ure; then
  445 + OO_SDK_URE_HOME="$OFFICE_HOME/ure"
  446 + else
  447 + if test "$host_cpu" = "x86_64"; then
  448 + OO_SDK_URE_HOME="/usr/lib64/ure"
  449 + else
  450 + OO_SDK_URE_HOME="/usr/lib/ure"
  451 + fi
  452 + fi
441 fi 453 fi
442 454
443 OO_SDK_URE_BIN_DIR=$OO_SDK_URE_HOME/bin 455 OO_SDK_URE_BIN_DIR=$OO_SDK_URE_HOME/bin