[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - 2 commits - bin/distro-install-sdk odk/config

[Rene Engelhard]

 bin/distro-install-sdk          |    2 +-
 odk/config/setsdkenv_unix.sh.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f5c6daa8c2bb9fa05ad9ee542c3621d30677e54b
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Apr 4 22:52:15 2016 +0200

    fix OO_SDK_NAME; s/openoffice.org/libreoffice/
    
    Change-Id: I21635701a95f1dfd1d5df1bbabdb5b81bf280639

diff --git a/bin/distro-install-sdk b/bin/distro-install-sdk
index f2b6e30..a92c3b5 100755
--- a/bin/distro-install-sdk
+++ b/bin/distro-install-sdk
@@ -65,7 +65,7 @@ if test -d $DESTDIR$INSTALLDIR/sdk ; then
     echo "$DOCDIR/sdk/examples"                                 >>$DESTDIR/gid_Module_Root_SDK
 
     # generate default profiles
-    sed -e "s, at OO_SDK_NAME@,openoffice.org${PRODUCTVERSION}_sdk," \
+    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," \
commit 6d5032153b9ff1aa13ace123cc73af140a06c2b6
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Apr 4 22:51:19 2016 +0200

    fix setsdkenv_unix.sh to work with *-linux-gnu* (as on e.g. armhf)
    
    Change-Id: I74edcd7e54f8edd05a4518d08b1af1e21f3add93

diff --git a/odk/config/setsdkenv_unix.sh.in b/odk/config/setsdkenv_unix.sh.in
index 4f9b879..1ca7249 100644
--- a/odk/config/setsdkenv_unix.sh.in
+++ b/odk/config/setsdkenv_unix.sh.in
@@ -154,7 +154,7 @@ case ${sdk_platform} in
     export DYLD_LIBRARY_PATH
     ;;
 
-  linux-gnu)
+  linux-gnu*)
     directoryname=linux
     comid=gcc3
     soext=so