From 3104fba6051328cb827042272fc6bccf05ccf5fb Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Fri, 10 Oct 2014 10:33:37 -0500 Subject: kill OUTPATH Change-Id: I91806c3a55905dfd1ae90a10bc890cc526ff3270 Reviewed-on: https://gerrit.libreoffice.org/11908 Reviewed-by: Andras Timar Tested-by: Andras Timar --- instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh | 4 ++-- instsetoo_native/inc_openoffice/unix/find-requires-x11.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'instsetoo_native') 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}" -- cgit v1.2.3