[Libreoffice-commits] .: liblangtag/makefile.mk

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Nov 6 07:40:46 PST 2012


 liblangtag/makefile.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8bd7e9a168a93dd148540871ab0d9dc2535e948e
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Nov 6 16:40:22 2012 +0100

    Tiny cleanup
    
    Change-Id: Ie5d2a6bbcf94c0906441a03b72100706884d0dcd

diff --git a/liblangtag/makefile.mk b/liblangtag/makefile.mk
index ab61c5a..e3febaa 100644
--- a/liblangtag/makefile.mk
+++ b/liblangtag/makefile.mk
@@ -78,7 +78,7 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure
 BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) && \
 			 $(AUGMENT_LIBRARY_PATH) $(GNUMAKE) install DESTDIR=$(my_destdir)
 
-.IF "$(SYSTEM_LIBXML)"!="YES" || "$(SYSTEM_GLIB)"!="YES"
+.IF "$(SYSTEM_LIBXML)"!="YES"
 .IF "$(OS)"=="FREEBSD" || "$(OS)"=="LINUX"
 CONFIGURE_FLAGS+= \
  LDFLAGS=-Wl,-z,origin\ -Wl,-rpath,\'\$$\$$ORIGIN:\$$\$$ORIGIN/../ure-link/lib\'
@@ -112,7 +112,7 @@ OUT2INC += $(my_install_relative)/include/liblangtag/*
 
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
-OUT2BIN += $(my_install_relative)/bin/liblangtag-0.dll
+OUT2BIN += $(my_install_relative)/bin/liblangtag-1.dll
 OUT2LIB += $(my_install_relative)/lib/liblangtag.dll.a
 .ELSE
 OUT2LIB += $(my_install_relative)/lib/langtag.lib*


More information about the Libreoffice-commits mailing list