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

Andrzej Hunt andrzej at ahunt.org
Mon Jun 1 11:29:17 PDT 2015


 external/udunits2/ExternalProject_udunits2.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cf271ee07b6ab6b4e09ee1c0d7e21896d1fd39a2
Author: Andrzej Hunt <andrzej at ahunt.org>
Date:   Mon Jun 1 19:28:39 2015 +0100

    Don't require use of makeinfo for udunits2
    
    The only way I could find of building _just_ the library,
    without the extraneous (for our purposes) documentation/packaging,
    seems to be calling this target.
    
    Change-Id: I6469754752c322b2060f09705daa387bb463f906

diff --git a/external/udunits2/ExternalProject_udunits2.mk b/external/udunits2/ExternalProject_udunits2.mk
index 070dc67..52aef28 100644
--- a/external/udunits2/ExternalProject_udunits2.mk
+++ b/external/udunits2/ExternalProject_udunits2.mk
@@ -20,7 +20,7 @@ $(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,\
-		$(MAKE) \
+		cd lib && $(MAKE) libudunits2.la \
 	)
 
 $(call gb_ExternalProject_get_state_target,udunits2,configure) :


More information about the Libreoffice-commits mailing list