[Libreoffice-commits] core.git: external/gpgme external/libassuan external/libgpg-error

[Thorsten Behrens]

 external/gpgme/ExternalPackage_gpgme.mk               |    2 +-
 external/libassuan/ExternalPackage_libassuan.mk       |    2 +-
 external/libgpg-error/ExternalPackage_libgpg-error.mk |    3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 91987a559bf1fde4a8d1eadc81e5711a7670fe69
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Thu Oct 26 19:15:26 2017 +0200

    fix windows packaging
    
    Change-Id: Id9e306877125b66f908d24048d236c55483330d0
    Reviewed-on: https://gerrit.libreoffice.org/43916
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/external/gpgme/ExternalPackage_gpgme.mk b/external/gpgme/ExternalPackage_gpgme.mk
index a09726e82bc8..8f772ec8e7e4 100644
--- a/external/gpgme/ExternalPackage_gpgme.mk
+++ b/external/gpgme/ExternalPackage_gpgme.mk
@@ -18,7 +18,7 @@ ifeq ($(OS),LINUX)
 $(eval $(call gb_ExternalPackage_add_file,gpgme,$(LIBO_LIB_FOLDER)/libgpgmepp.so.6,lang/cpp/src/.libs/libgpgmepp.so.6.4.0))
 $(eval $(call gb_ExternalPackage_add_file,gpgme,$(LIBO_LIB_FOLDER)/libgpgme.so.11,src/.libs/libgpgme.so.11.18.0))
 
-else
+else ifeq ($(OS),MACOSX)
 
 $(eval $(call gb_ExternalPackage_add_file,gpgme,$(LIBO_LIB_FOLDER)/libgpgmepp.6.dylib,lang/cpp/src/.libs/libgpgmepp.6.dylib))
 $(eval $(call gb_ExternalPackage_add_file,gpgme,$(LIBO_LIB_FOLDER)/libgpgme.11.dylib,src/.libs/libgpgme.11.dylib))
diff --git a/external/libassuan/ExternalPackage_libassuan.mk b/external/libassuan/ExternalPackage_libassuan.mk
index 837e0ce49f56..41af53b2c373 100644
--- a/external/libassuan/ExternalPackage_libassuan.mk
+++ b/external/libassuan/ExternalPackage_libassuan.mk
@@ -17,7 +17,7 @@ ifeq ($(OS),LINUX)
 
 $(eval $(call gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.0,src/.libs/libassuan.so.0.7.3))
 
-else
+else ifeq ($(OS),MACOSX)
 
 $(eval $(call gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.0.dylib,src/.libs/libassuan.0.dylib))
 
diff --git a/external/libgpg-error/ExternalPackage_libgpg-error.mk b/external/libgpg-error/ExternalPackage_libgpg-error.mk
index e5e60685ac3f..a7c04ff9c900 100644
--- a/external/libgpg-error/ExternalPackage_libgpg-error.mk
+++ b/external/libgpg-error/ExternalPackage_libgpg-error.mk
@@ -17,11 +17,10 @@ ifeq ($(OS),LINUX)
 
 $(eval $(call gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error.so.0,src/.libs/libgpg-error.so.0.22.0))
 
-else
+else ifeq ($(OS),MACOSX)
 
 $(eval $(call gb_ExternalPackage_add_file,libgpg-error,$(LIBO_LIB_FOLDER)/libgpg-error.0.dylib,src/.libs/libgpg-error.0.dylib))
 
-
 endif
 
 endif # $(DISABLE_DYNLOADING)