[Libreoffice] [PATCH] fix linking the hyphen library

Robert Nagy robert at openbsd.org
Sun Nov 7 11:42:49 PST 2010


If the internal hyphen library is used which does not
build a shared object, then link to $(SOLARLIBDIR)/libhyphen.a,
instead of using -lhyphen on UNX + GCC.
Also remove the unneccesary HNJLIB because that is defined in
solenv/inc/lib.mk already.
---
 .../hyphenator/altlinuxhyph/hyphen/makefile.mk     |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
index f3626c7..5c98b06 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
@@ -32,10 +32,8 @@ TARGET	= hyphen_lib
 ENABLE_EXCEPTIONS=TRUE
 USE_DEFFILE=TRUE
 
-.IF "$(GUI)"=="OS2"
-HNJLIB=hyphen.lib
-.ELIF "$(GUI)"=="UNX" || "$(COM)"=="GCC"
-HNJLIB=-lhyphen
+.IF "$(SYSTEM_HYPH)"=="NO" && ("$(GUI)"=="UNX" || "$(COM)"=="GCC")
+HNJLIB=$(SOLARLIBDIR)/libhyphen.a
 .ELSE
 HNJLIB=hyphen.lib
 .ENDIF
-- 
1.7.3.1



More information about the LibreOffice mailing list