[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - bin/distro-install-sdk

[Rene Engelhard]

 bin/distro-install-sdk |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 6bca9229f832306d3b5dbb571185adc005035ff1
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Jun 26 21:18:00 2017 +0200

    fix SDK paths (especially cat/sed) in bin/distro-install-sdk
    
    wonder how that ever worked. cat and sed are in /bin, not /usr/bin.
    Appparetly the BSDs have them there, though, so generalize though this
    is for distros and it probably shouldn't matter.
    
    Change-Id: I6efb3e92b8f8d15f3671090a3eaa9d8836f9998f
    Reviewed-on: https://gerrit.libreoffice.org/39276
    Reviewed-by: Rene Engelhard <rene at debian.org>
    Tested-by: Rene Engelhard <rene at debian.org>
    Reviewed-on: https://gerrit.libreoffice.org/39447
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/bin/distro-install-sdk b/bin/distro-install-sdk
index a92c3b5d650c..e8cf28d618d4 100755
--- a/bin/distro-install-sdk
+++ b/bin/distro-install-sdk
@@ -68,11 +68,11 @@ if test -d $DESTDIR$INSTALLDIR/sdk ; then
     sed -e "s, at OO_SDK_NAME@,libreoffice${PRODUCTVERSION}_sdk," \
         -e "s, at OO_SDK_HOME@,$INSTALLDIR/sdk," \
         -e "s, at OFFICE_HOME@,$INSTALLDIR," \
-        -e "s, at OO_SDK_MAKE_HOME@,/usr/bin," \
-        -e "s, at OO_SDK_ZIP_HOME@,/usr/bin," \
-        -e "s, at OO_SDK_CPP_HOME@,/usr/bin," \
-        -e "s, at OO_SDK_SED_HOME@,/usr/bin," \
-        -e "s, at OO_SDK_CAT_HOME@,/usr/bin," \
+        -e "s, at OO_SDK_MAKE_HOME@,$(dirname $(command -v make))," \
+        -e "s, at OO_SDK_ZIP_HOME@,$(dirname $(command -v zip))," \
+        -e "s, at OO_SDK_CPP_HOME@,$(dirname $(command -v cpp))," \
+        -e "s, at OO_SDK_SED_HOME@,$(dirname $(command -v sed))," \
+        -e "s, at OO_SDK_CAT_HOME@,$(dirname $(command -v cat))," \
         -e "s, at OO_SDK_JAVA_HOME@,$JAVA_HOME," \
         -e "s, at OO_SDK_OUTPUT_DIR@,\$HOME," \
         -e "s, at SDK_AUTO_DEPLOYMENT@,NO," \