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

[Stephan Bergmann]

 Makefile.in                     |    1 -
 solenv/bin/install-gdb-printers |   16 ++++++++++------
 solenv/bin/linkoo               |    2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 23af3341322143f2edde5a6c6668294c915c3ae5
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Oct 4 23:32:39 2011 +0200

    Some fixes for linkoo and install-gdb-printers.
    
    - Adapted linkoo's link_gdb_py to libs moved from basis to brand layer.
    - Fixed install-gdb-printers's handling of Mac OS X ".dylib" suffix.
    - No need to call install-gdb-printers from top-level make dev-install;
      linkoo's link_gdb_py already does that.

diff --git a/Makefile.in b/Makefile.in
index 2b5eb5c..b7fd5f5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,7 +32,6 @@ dev-install: build
             ln -s "$$SOLARVER/$$INPATH"/installation/opt/ \
                 "@abs_builddir@"/install && \
             printf '\n' && \
-            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 b4dcd0d..eaab2e8 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -29,7 +29,11 @@
 GDBDIR="${SOLARENV}/gdb"
 SOLVERLIBDIR="${SOLARVER}/${INPATH}/lib"
 INSTALLDIR="${SOLARVER}/${INPATH}/installation/opt"
-[ "$(uname)" = Darwin ] && INSTALLDIR=$INSTALLDIR/LibreOffice.app/Contents
+DYLIB=so
+if [ "$(uname)" = Darwin ]; then
+    INSTALLDIR=$INSTALLDIR/LibreOffice.app/Contents
+    DYLIB=dylib
+fi
 
 die() {
     echo "$1" >&2
@@ -165,10 +169,10 @@ if [[ ${DESTDIR}${pythondir} != ${GDBDIR} ]]; then
     cp -r "${GDBDIR}/libreoffice" "${DESTDIR}${pythondir}"
 fi
 
-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}
+make_autoload cppu basis-link/ure-link/lib libuno_cppu."$DYLIB".3
+make_autoload sal basis-link/ure-link/lib libuno_sal."$DYLIB".3
+make_autoload svl program libsvllo."$DYLIB"
+make_autoload sw program libswlo."$DYLIB"
+make_autoload tl program libtllo."$DYLIB"
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 5da680c..14b595b 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -374,7 +374,7 @@ sub link_gdb_py()
 	print STDERR "Warning: missing helpful python debug helpers\n";
     } else {
 	for my $c (@basis) {
-	    do_link ($src, "$OOO_INSTALL/basis-link/program", $c, $c, 1);
+	    do_link ($src, "$OOO_INSTALL/program", $c, $c, 1);
 	}
 	for my $c (@ure) {
 	    do_link ($src, "$OOO_INSTALL/ure/lib", $c, $c, 1);