[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - odk/pack

Michael Stahl mstahl at redhat.com
Wed Apr 10 23:23:32 PDT 2013


 odk/pack/copying/makefile.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e6fd93bdd2d7034f102ef6a80d6cd03461b7d1a9
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Apr 10 14:59:12 2013 +0200

    odk: fix packaging of purpenvhelper import lib on WNT
    
    This import lib was apparently renamed in LO 3.6 and the crappy dmake
    build system in odk silently dropped it from the packages.
    This problem was fixed differently on master by converting the module to
    gbuild.
    
    Change-Id: Ib07e1472815b7d068cd718f6c733630fd59639d2
    Reviewed-on: https://gerrit.libreoffice.org/3308
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk
index 0feafee..948683c 100644
--- a/odk/pack/copying/makefile.mk
+++ b/odk/pack/copying/makefile.mk
@@ -81,7 +81,7 @@ LIBLIST = \
     $(DESTDIRLIB)/icppu.lib 	\
     $(DESTDIRLIB)/icppuhelper.lib 	\
     $(DESTDIRLIB)/irmcxt.lib \
-    $(DESTDIRLIB)/ipurpenvhelper3MSC.lib
+    $(DESTDIRLIB)/ipurpenvhelper.lib
 .ENDIF
 
 .IF "$(OS)"=="LINUX"


More information about the Libreoffice-commits mailing list