diff options
| author | Rene Engelhard <rene@debian.org> | 2017-06-26 21:18:00 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-07-03 11:36:56 +0200 |
| commit | 6bca9229f832306d3b5dbb571185adc005035ff1 (patch) | |
| tree | 46312d847c5d1df09ccdbb99f019f0b722b52158 /bin | |
| parent | d1f37f6439ea06f0010f895abb157d7250a7204f (diff) | |
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@debian.org>
Tested-by: Rene Engelhard <rene@debian.org>
Reviewed-on: https://gerrit.libreoffice.org/39447
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/distro-install-sdk | 10 |
1 files changed, 5 insertions, 5 deletions
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,@OO_SDK_NAME@,libreoffice${PRODUCTVERSION}_sdk," \ -e "s,@OO_SDK_HOME@,$INSTALLDIR/sdk," \ -e "s,@OFFICE_HOME@,$INSTALLDIR," \ - -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \ - -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \ - -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \ - -e "s,@OO_SDK_SED_HOME@,/usr/bin," \ - -e "s,@OO_SDK_CAT_HOME@,/usr/bin," \ + -e "s,@OO_SDK_MAKE_HOME@,$(dirname $(command -v make))," \ + -e "s,@OO_SDK_ZIP_HOME@,$(dirname $(command -v zip))," \ + -e "s,@OO_SDK_CPP_HOME@,$(dirname $(command -v cpp))," \ + -e "s,@OO_SDK_SED_HOME@,$(dirname $(command -v sed))," \ + -e "s,@OO_SDK_CAT_HOME@,$(dirname $(command -v cat))," \ -e "s,@OO_SDK_JAVA_HOME@,$JAVA_HOME," \ -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \ -e "s,@SDK_AUTO_DEPLOYMENT@,NO," \ |