[Libreoffice-commits] .: Branch 'libreoffice-3-3' - bin/unpack

Petr Mladek pmladek at kemper.freedesktop.org
Thu Jan 6 11:14:00 PST 2011


 bin/unpack |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 7856246004e034ffbe74831fad662629d9a21925
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Jan 6 20:10:40 2011 +0100

    Fix build with ConvertTextToNumber extension
    
    Reverted part of the commit 2d5cf3d660abb3b565a6a3245cd6e5a732bab47a

diff --git a/bin/unpack b/bin/unpack
index 3d1af73..a23a103 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -881,10 +881,9 @@ fi
 
 if test "x$CT2N_EXTENSION" != "x"; then
     check_file $SRCDIR/$CT2N_EXTENSION
-    echo "Copying ConvertTextToNumber extension into the tree"
-    mkdir -p $OOBUILDDIR/extras/source/extensions/ || exit 1
+    echo "Linking ConvertTextToNumber extension sources to the expected name"
     md5=`md5sum $SRCDIR/$CT2N_EXTENSION | cut -d' ' -f1`
-    cp $SRCDIR/$md5-$CT2N_EXTENSION $OOBUILDDIR/extras/source/extensions/ConvertTextToNumber.oxt || exit 1
+    ln -sf $SRCDIR/$CT2N_EXTENSION $SRCDIR/$md5-$CT2N_EXTENSION || exit 1
     # create empty module dir so bin/applyflags could force applying the build patches
     mkdir -p $OOBUILDDIR/ct2n
 fi


More information about the Libreoffice-commits mailing list