summaryrefslogtreecommitdiff
path: root/openssl
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-02-19 07:29:28 +0000
committerOliver Bolte <obo@openoffice.org>2009-02-19 07:29:28 +0000
commit177eb5d1cde50cdbf06a3175b5b78bcc9c2a5718 (patch)
tree8dbb03bf25f7934853e4976ae8c4bf282548b872 /openssl
parent919ed9efc7ea458e9beb017218509e296f650920 (diff)
CWS-TOOLING: integrate CWS ause099
2009-01-29 12:30:57 +0100 hjs r267116 : #i98365# fix unsetting g+s bit 2009-01-23 14:21:19 +0100 hjs r266819 : #i40246# - cleanup 2009-01-23 14:14:07 +0100 hjs r266818 : #i40246# - fix quoting of final echo line 2009-01-23 12:42:33 +0100 hjs r266807 : #i98365# leave higher bits alone 2009-01-23 11:23:42 +0100 rt r266799 : Header 2009-01-22 19:14:25 +0100 hjs r266753 : #i98365# remove unwanted file attributes from archives 2009-01-22 16:22:18 +0100 hjs r266737 : #i98365# remove unwanted file attributes from archives 2009-01-22 16:20:54 +0100 hjs r266736 : #i98365# remove unwanted file attributes from archives 2009-01-22 16:20:24 +0100 hjs r266735 : #i98365# remove unwanted file attributes from archives 2009-01-22 16:08:33 +0100 hjs r266734 : #i40246# renamed variable 2009-01-22 16:05:26 +0100 hjs r266733 : #i40246# renamed variable 2009-01-20 17:46:54 +0100 hjs r266610 : #i98290# cleanup 2009-01-19 19:32:19 +0100 hjs r266522 : CWS-TOOLING: rebase CWS ause099 to trunk@266428 (milestone: DEV300:m39) 2008-12-08 21:00:09 +0100 hjs r265049 : CWS-TOOLING: rebase CWS ause099 to trunk@264807 (milestone: DEV300:m37) 2008-11-27 18:25:18 +0100 hjs r264513 : #i40246# - support multiple patches per archive 2008-11-17 19:00:12 +0100 hjs r263738 : CWS-TOOLING: rebase CWS ause099 to trunk@263288 (milestone: DEV300:m35)
Diffstat (limited to 'openssl')
-rw-r--r--openssl/makefile.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index db156b1a3b13..671f77ab22c3 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -66,7 +66,7 @@ OUT2LIB += libcrypto.*
OUT2INC += include/openssl/*
.IF "$(OS)" == "LINUX"
- PATCH_FILE_NAME=openssllnx.patch
+ PATCH_FILES=openssllnx.patch
ADDITIONAL_FILES:= \
libcrypto_OOo_0_9_8e.map \
libssl_OOo_0_9_8e.map
@@ -75,7 +75,7 @@ OUT2INC += include/openssl/*
.ENDIF
.IF "$(OS)" == "SOLARIS"
- PATCH_FILE_NAME=opensslsol.patch
+ PATCH_FILES=opensslsol.patch
ADDITIONAL_FILES:= \
libcrypto_OOo_0_9_8e.map \
libssl_OOo_0_9_8e.map
@@ -103,7 +103,7 @@ OUT2INC += include/openssl/*
.IF "$(OS)" == "WNT"
.IF "$(COM)"=="GCC"
-PATCH_FILE_NAME=opensslmingw.patch
+PATCH_FILES=opensslmingw.patch
.IF "$(USE_MINGW)" == "cygwin"
CONFIGURE_ACTION=$(PERL) configure
CONFIGURE_FLAGS=mingw shared
@@ -126,7 +126,7 @@ OUT2BIN += out/libeay32.dll
.ENDIF
.ELSE
- PATCH_FILE_NAME=openssl.patch
+ PATCH_FILES=openssl.patch
.IF "$(MAKETARGETS)" == ""
# The env. vars CC and PERL are used by nmake, and nmake insists on '\'s
# If WRAPCMD is set it is prepended before the compiler, don't touch that.