diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-01-09 13:19:06 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-01-09 13:19:06 +0000 |
commit | 9e55c62f188170b5e56b86427e93e6d6288832a2 (patch) | |
tree | eaebe8c4416ba4be31c048a0be60a896de922f16 | |
parent | b0dbdcc645aac7423c7ff262f1f3d3e24fe86e3c (diff) |
#i10000# Setting CFLAGS in CONFIGURE_FLAGS overrides ADDCFLAGS and thereby removes SYSBASE setting.
-rw-r--r-- | libxml2/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index e011b375c367..ef5f5a60728c 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.18 $ +# $Revision: 1.19 $ # -# last change: $Author: obo $ $Date: 2008-01-04 14:58:40 $ +# last change: $Author: rt $ $Date: 2008-01-09 14:19:06 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -93,7 +93,7 @@ xml2_LDFLAGS+=-Wl,-z,noexecstack CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS)" CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)" +CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS) $(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)" BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) |