diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-10-10 10:33:37 -0500 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2014-10-23 08:10:19 +0000 |
commit | 3104fba6051328cb827042272fc6bccf05ccf5fb (patch) | |
tree | b4653342d6f0811f3f4d9abee0d981ff38830b4c /instsetoo_native | |
parent | Remove ScToken from the formula::FormulaToken hierarchy (diff) | |
download | core-3104fba6051328cb827042272fc6bccf05ccf5fb.tar.gz core-3104fba6051328cb827042272fc6bccf05ccf5fb.zip |
kill OUTPATH
Change-Id: I91806c3a55905dfd1ae90a10bc890cc526ff3270
Reviewed-on: https://gerrit.libreoffice.org/11908
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'instsetoo_native')
-rw-r--r-- | instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh | 4 | ||||
-rw-r--r-- | instsetoo_native/inc_openoffice/unix/find-requires-x11.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh b/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh index d0fadac41fa6..8b91d77d945f 100644 --- a/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh +++ b/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh @@ -18,8 +18,8 @@ # cat > /dev/null -[[ "${OUTPATH}" == unxlngx* ]] && mark64="()(64bit)" -if [[ "${OUTPATH}" == unxaig* ]]; then +[[ "${PLATFORMID}" == "linux_x86_64" ]] && mark64="()(64bit)" +if [[ "${OS}" == "AIX" ]]; then echo "libgnomevfs-2.a(libgnomevfs-2.so.0${mark64})" echo "libgconf-2.a(libgconf-2.so.4${mark64})" else diff --git a/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh b/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh index 9b0996ed6d83..b8463dc2750f 100644 --- a/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh +++ b/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh @@ -18,8 +18,8 @@ # cat > /dev/null -[[ "${OUTPATH}" == unxlngx* ]] && mark64="()(64bit)" -if [[ "${OUTPATH}" == unxaig* ]]; then +[[ "${PLATFORMID}" == "linux_x86_64" ]] && mark64="()(64bit)" +if [[ "${OS}" == "AIX" ]]; then echo "libfreetype.a(libfreetype.so.6${mark64})" else echo "libfreetype.so.6${mark64}" |