[Libreoffice-commits] .: Makefile.in solenv/bin

[Stephan Bergmann]

 Makefile.in                     |    3 +--
 solenv/bin/install-gdb-printers |   14 ++++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 235a5e6c323432bf44db8de6cd05d1a5cc526022
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Sep 29 20:55:27 2011 +0200

    Make install-gdb-printers work on Mac OS X.

diff --git a/Makefile.in b/Makefile.in
index ec38633..2b5eb5c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,8 +32,7 @@ dev-install: build
             ln -s "$$SOLARVER/$$INPATH"/installation/opt/ \
                 "@abs_builddir@"/install && \
             printf '\n' && \
-            install-gdb-printers -a "$$SOLARVER/$$INPATH/installation/opt" \
-                -L && \
+            install-gdb-printers -L && \
             printf \
                 '\nDeveloper installation finished, you can now execute:\n\n' \
                 && \
diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index 3606dca..b4dcd0d 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -29,6 +29,7 @@
 GDBDIR="${SOLARENV}/gdb"
 SOLVERLIBDIR="${SOLARVER}/${INPATH}/lib"
 INSTALLDIR="${SOLARVER}/${INPATH}/installation/opt"
+[ "$(uname)" = Darwin ] && INSTALLDIR=$INSTALLDIR/LibreOffice.app/Contents
 
 die() {
     echo "$1" >&2
@@ -82,7 +83,8 @@ make_autoload() {
     local lib="${dir}/$3"
 
     if ! ${flat}; then
-        lib="$(readlink -f "${DESTDIR}${installdir}/$2/$3")"
+        local resolved="$(readlink "${DESTDIR}${installdir}/$2/$3")"
+        [ -n "$resolved" ] && lib=$resolved
         dir="${lib%/*}"
     fi
 
@@ -163,10 +165,10 @@ if [[ ${DESTDIR}${pythondir} != ${GDBDIR} ]]; then
     cp -r "${GDBDIR}/libreoffice" "${DESTDIR}${pythondir}"
 fi
 
-make_autoload cppu basis-link/ure-link/lib libuno_cppu.so.3
-make_autoload sal basis-link/ure-link/lib libuno_sal.so.3
-make_autoload svl basis-link/program libsvllo.so
-make_autoload sw basis-link/program libswlo.so
-make_autoload tl basis-link/program libtllo.so
+make_autoload cppu basis-link/ure-link/lib libuno_cppu.{dylib,so}.3
+make_autoload sal basis-link/ure-link/lib libuno_sal.{dylib,so}.3
+make_autoload svl program libsvllo.{dylib,so}
+make_autoload sw program libswlo.{dylib,so}
+make_autoload tl program libtllo.{dylib,so}
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab: