diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-09-21 08:26:36 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-09-21 08:26:36 +0000 |
| commit | 78ac0f5a658543549e9db690a407acc2355a613e (patch) | |
| tree | 559b9694e8e821bb9e2c97cce7c09f957690063f /curl | |
| parent | e6172cc07315fe36c198882163ac2400cf195305 (diff) | |
INTEGRATION: CWS obr06 (1.20.10); FILE MERGED
2007/09/07 05:40:48 obr 1.20.10.1: #i81334# passed include path as CPPFLAGS instead of CFLAGS
Diffstat (limited to 'curl')
| -rw-r--r-- | curl/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/curl/makefile.mk b/curl/makefile.mk index 1a9a9e4ec1b8..3e3f30c8b429 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.21 $ +# $Revision: 1.22 $ # -# last change: $Author: vg $ $Date: 2007-09-20 16:33:47 $ +# last change: $Author: vg $ $Date: 2007-09-21 09:26:36 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -70,7 +70,7 @@ curl_LDFLAGS+=-Wl,-z,noexecstack CONFIGURE_DIR=.$/ #relative to CONFIGURE_DIR CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS= --without-ssl --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict --disable-static ADDCFLAGS="$(curl_CFLAGS)" LDFLAGS="$(curl_LDFLAGS)" +CONFIGURE_FLAGS= --without-ssl --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict --disable-static CPPFLAGS="$(curl_CFLAGS)" LDFLAGS="$(curl_LDFLAGS)" BUILD_DIR=$(CONFIGURE_DIR)$/lib .IF "$(OS)"=="IRIX" |