summaryrefslogtreecommitdiff
path: root/curl
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2003-07-16 16:24:06 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2003-07-16 16:24:06 +0000
commita35207acb6bac4e100b27ec589624d97c66f6e28 (patch)
tree9803cf85acd8e0dc0eb4748f4dba6cb9e1b04fce /curl
parent1410c8be2e8a59c6b6e72ad6b6b3ff40bef89d3e (diff)
INTEGRATION: CWS ooo11rc2 (1.7.4); FILE MERGED
2003/07/11 09:41:04 mh 1.7.4.1: add: patches IRIX, #i16698#
Diffstat (limited to 'curl')
-rw-r--r--curl/makefile.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/curl/makefile.mk b/curl/makefile.mk
index 74bfa171f366..cb0b27ead961 100644
--- a/curl/makefile.mk
+++ b/curl/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.7 $
+# $Revision: 1.8 $
#
-# last change: $Author: vg $ $Date: 2003-06-02 09:49:28 $
+# last change: $Author: hr $ $Date: 2003-07-16 17:24:06 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -81,7 +81,11 @@ CONFIGURE_ACTION=.$/configure
CONFIGURE_FLAGS= --without-ssl --enable-ftp --enable-ipv6 --disable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict
BUILD_DIR=$(CONFIGURE_DIR)$/lib
+.IF "$(OS)"=="IRIX"
+BUILD_ACTION=gmake
+.ELSE
BUILD_ACTION=make
+.ENDIF
OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl*$(DLLPOST)
.ENDIF # "$(GUI)"=="UNX"