[Libreoffice-commits] core.git: Branch 'feature/unitver' - external/udunits2

[Andrzej Hunt]

Rebased ref, commits from common ancestor:
commit 8b75bd5c1f9ad2ff3981fd909d07855530d28c2c
Author: Andrzej Hunt <andrzej at ahunt.org>
Date:   Wed Jun 3 17:07:15 2015 +0100

    Possibly fix udunits2 loading on OSX
    
    Change-Id: I048d23d647a6d6f38efddc11f7d3bde3b583e752

diff --git a/external/udunits2/ExternalProject_udunits2.mk b/external/udunits2/ExternalProject_udunits2.mk
index ba6479e..0c7a7d7 100644
--- a/external/udunits2/ExternalProject_udunits2.mk
+++ b/external/udunits2/ExternalProject_udunits2.mk
@@ -21,9 +21,12 @@ $(eval $(call gb_ExternalProject_register_targets,udunits2,\
 $(call gb_ExternalProject_get_state_target,udunits2,build) : $(call gb_ExternalProject_get_state_target,udunits2,configure)
 	+$(call gb_ExternalProject_run,build,\
 		cd lib && \
-	    $(MAKE) libudunits2.la && \
+	    $(MAKE) libudunits2.la \
 		mkdir udunits2 && \
 		cp udunits2.h udunits2/ \
+		$(if $(filter MACOSX,$(OS)),&& $(PERL) \
+			$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
+			$(gb_Package_SOURCEDIR_udunits2)/.lib/libudunits2.0.dylib) \
 	)
 
 $(call gb_ExternalProject_get_state_target,udunits2,configure) :