[Libreoffice-commits] .: 2 commits - external/CustomTarget_wine.mk external/Package_wine.mk

[Libreoffice Gerrit user]

 external/CustomTarget_wine.mk |    2 +-
 external/Package_wine.mk      |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit acfd176c3052692c85f4cac3103695be4e8f74df
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Dec 31 21:33:50 2012 +0100

    name the libs to deliver correctly
    
    Change-Id: Ib1017e36339b8a3eaba8351d12b700d5b29c49b0

diff --git a/external/Package_wine.mk b/external/Package_wine.mk
index 64ee28c..0e33fe7 100644
--- a/external/Package_wine.mk
+++ b/external/Package_wine.mk
@@ -10,9 +10,9 @@
 $(eval $(call gb_Package_Package,dbghelp,$(call gb_CustomTarget_get_workdir,external/wine)))
 
 $(eval $(call gb_Package_add_files,dbghelp,lib,\
-	gdiplus.dll.a \
-	msi.dll.a \
-	urlmon.dll.a \
+	libgdiplus.dll.a \
+	libmsi.dll.a \
+	liburlmon.dll.a \
 ))
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:
commit b87e86c5b1ce547a804cfc8ed7d5cb7bc82a5ce8
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Dec 31 21:32:56 2012 +0100

    fix typo
    
    Change-Id: I547cbac3e8c14485a01716f099c37a96e5876ee4

diff --git a/external/CustomTarget_wine.mk b/external/CustomTarget_wine.mk
index 7d4ccdd..9a51b0e 100644
--- a/external/CustomTarget_wine.mk
+++ b/external/CustomTarget_wine.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,external/wine))
 $(eval $(call gb_CustomTarget_register_targets,external/wine,\
 	libgdiplus.dll.a \
 	libmsi.dll.a \
-	liburlmod.dll.a \
+	liburlmon.dll.a \
 ))
 
 $(call gb_CustomTarget_get_workdir,external/wine)/lib%.dll.a : $(SRCDIR)/external/wine/lib/%.def