[Libreoffice-commits] .: RepositoryExternal.mk

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Oct 26 04:39:19 PDT 2012


 RepositoryExternal.mk |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 1e925461d5371fc6cbaa9facbdf40a6c99a85549
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Fri Oct 26 13:37:59 2012 +0200

    RepositoryExternal: add disabled graphite case
    
    Change-Id: I16c40fceb2fc84147eb298aa86987b8682a81c8e

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 04a2aab..83d90ad 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -774,7 +774,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(GRAPHITE_LIBS))
 
 endef
 
-else # !SYSTEM_GRAPHITE
+else ifeq ($(SYSTEM_GRAPHITE),NO)
 
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 	graphite \
@@ -790,6 +790,10 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
 
 endef
 
+else # DISABLED GRAPHITE
+
+gb_LinkTarget__use_graphite :=
+
 endif # SYSTEM_GRAPHITE
 
 


More information about the Libreoffice-commits mailing list