summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--beanshell/makefile.mk2
-rw-r--r--cppunit/makefile.mk2
-rw-r--r--epm/makefile.mk2
-rw-r--r--external/glibc/makefile.mk2
-rw-r--r--fondu/makefile.mk2
-rwxr-xr-xhsqldb/makefile.mk2
-rw-r--r--hyphen/makefile.mk2
-rw-r--r--icc/makefile.mk4
-rw-r--r--libtextcat/makefile.mk2
-rw-r--r--libwpd/makefile.mk2
-rw-r--r--libxmlsec/makefile.mk2
-rw-r--r--lpsolve/makefile.mk4
-rw-r--r--lucene/makefile.mk2
-rw-r--r--msfontextract/makefile.mk2
-rw-r--r--openssl/makefile.mk8
-rw-r--r--redland/raptor/makefile.mk2
-rw-r--r--redland/rasqal/makefile.mk2
-rw-r--r--redland/redland/makefile.mk2
-rwxr-xr-xrhino/makefile.mk2
-rw-r--r--vigra/makefile.mk2
20 files changed, 25 insertions, 25 deletions
diff --git a/beanshell/makefile.mk b/beanshell/makefile.mk
index 53924d2068bc..215c59891d0b 100644
--- a/beanshell/makefile.mk
+++ b/beanshell/makefile.mk
@@ -43,7 +43,7 @@ TARGET=ooo_beanshell
TARFILE_NAME=bsh-2.0b1-src
TARFILE_ROOTDIR=BeanShell
-PATCH_FILE_NAME=bsh-2.0b1-src.patch
+PATCH_FILES=bsh-2.0b1-src.patch
ADDITIONAL_FILES=makefile.mk
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 8c05a02e753e..8f636569d8b2 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -115,7 +115,7 @@ ADDITIONAL_FILES=\
src$/win32$/makefile.mk \
src$/win32$/winstuff.cxx
-PATCH_FILE_NAME=cppunit-1.8.0-r1.patch
+PATCH_FILES=cppunit-1.8.0-r1.patch
# CONFIGURE_DIR=
# CONFIGURE_ACTION=
diff --git a/epm/makefile.mk b/epm/makefile.mk
index 869c32a1b7ee..5f4f93db31b1 100644
--- a/epm/makefile.mk
+++ b/epm/makefile.mk
@@ -41,7 +41,7 @@ TARGET=epm
# --- Files --------------------------------------------------------
TARFILE_NAME=epm-3.7
-PATCH_FILE_NAME=epm-3.7.patch
+PATCH_FILES=epm-3.7.patch
.IF "$(GUI)"=="UNX" && "$(BUILD_EPM)" != "NO"
diff --git a/external/glibc/makefile.mk b/external/glibc/makefile.mk
index 6134dbc54a4b..8940a0cd2f84 100644
--- a/external/glibc/makefile.mk
+++ b/external/glibc/makefile.mk
@@ -44,7 +44,7 @@ TARFILE_NAME=glibc-2.1.3-stub
TARFILE_ROOTDIR=glibc-2.1.3
ADDITIONAL_FILES=posix$/makefile.mk posix$/config.h posix$/readdir_r.c
-PATCH_FILE_NAME=$(PRJ)$/glibc-2.1.3.patch
+PATCH_FILES=$(PRJ)$/glibc-2.1.3.patch
#CONFIGURE_DIR=glibc-2.1.3/posix
CONFIGURE_ACTION=
diff --git a/fondu/makefile.mk b/fondu/makefile.mk
index 436df25305db..a543eaaa808a 100644
--- a/fondu/makefile.mk
+++ b/fondu/makefile.mk
@@ -70,4 +70,4 @@ OUT2BIN=$(BUILD_DIR)$/fondu
# contains the "magic" to create targets out of the set variables.
-.INCLUDE : tg_ext.mk \ No newline at end of file
+.INCLUDE : tg_ext.mk
diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk
index 82b46115bd9e..375cdc33bc0e 100755
--- a/hsqldb/makefile.mk
+++ b/hsqldb/makefile.mk
@@ -55,7 +55,7 @@ TARFILE_ROOTDIR=hsqldb
CONVERTFILES=build$/build.xml \
src$/org$/hsqldb$/persist$/HsqlDatabaseProperties.java
-PATCH_FILE_NAME=patches$/accumulated_patches.patch
+# PATCH_FILES=patches$/accumulated_patches.patch
# ADDITIONAL_FILES= src$/org$/hsqldb$/Collation.java \
# src$/org$/hsqldb$/TxManager.java \
diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index 62f3b4f4a376..770f3d5e8592 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -44,7 +44,7 @@ TARFILE_NAME=hyphen-2.3.1
ADDITIONAL_FILES += makefile.mk
-PATCH_FILE_NAME=hyphen-2.3.patch
+PATCH_FILES=hyphen-2.3.patch
.IF "$(GUI)"=="UNX"
CONFIGURE_DIR=$(BUILD_DIR)
diff --git a/icc/makefile.mk b/icc/makefile.mk
index 5d1b21a4f845..b688104f3870 100644
--- a/icc/makefile.mk
+++ b/icc/makefile.mk
@@ -43,9 +43,9 @@ TARGET=icc
TARFILE_NAME=SampleICC-1.3.2
#checking for endianess
.IF "$(CPU)"=="I"
-PATCH_FILE_NAME=$(TARFILE_NAME).patch
+PATCH_FILES=$(TARFILE_NAME).patch
.ELSE
-PATCH_FILE_NAME=$(TARFILE_NAME)-bendian.patch
+PATCH_FILES=$(TARFILE_NAME)-bendian.patch
.ENDIF
CONVERTFILES= \
diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk
index c7da97deb094..33c76042be97 100644
--- a/libtextcat/makefile.mk
+++ b/libtextcat/makefile.mk
@@ -43,7 +43,7 @@ TARGET=libtextcat
TARFILE_NAME=libtextcat-2.2
TARFILE_ROOTDIR=libtextcat-2.2
-PATCH_FILE_NAME=libtextcat-2.2.patch
+PATCH_FILES=libtextcat-2.2.patch
ADDITIONAL_FILES= \
diff --git a/libwpd/makefile.mk b/libwpd/makefile.mk
index e97171ed499f..0d66765ba4d8 100644
--- a/libwpd/makefile.mk
+++ b/libwpd/makefile.mk
@@ -46,7 +46,7 @@ TARGET=wpd
.ENDIF
TARFILE_NAME=libwpd-0.8.8
-PATCH_FILE_NAME=$(TARFILE_NAME).diff
+PATCH_FILES=$(TARFILE_NAME).diff
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src$/lib
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index 376ffc469bec..15531839f067 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -49,7 +49,7 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
XMLSEC1VERSION=1.2.6
TARFILE_NAME=$(PRJNAME)-$(XMLSEC1VERSION)
-PATCH_FILE_NAME=$(TARFILE_NAME).patch
+PATCH_FILES=$(TARFILE_NAME).patch
ADDITIONAL_FILES= \
include$/xmlsec$/nss$/akmngr.h \
diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk
index b36abbebb29b..a69d5494d2a2 100644
--- a/lpsolve/makefile.mk
+++ b/lpsolve/makefile.mk
@@ -43,9 +43,9 @@ TARGET=lpsolve
TARFILE_NAME=lp_solve_5.5
.IF "$(GUI)"=="WNT"
-PATCH_FILE_NAME=lp_solve_5.5-windows.patch
+PATCH_FILES=lp_solve_5.5-windows.patch
.ELSE
-PATCH_FILE_NAME=lp_solve_5.5.patch
+PATCH_FILES=lp_solve_5.5.patch
ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2
.ENDIF
diff --git a/lucene/makefile.mk b/lucene/makefile.mk
index 23173d5a2d5c..2d87f23bd312 100644
--- a/lucene/makefile.mk
+++ b/lucene/makefile.mk
@@ -53,7 +53,7 @@ LUCENE_CORE_JAR=lucene-core-$(LUCENE_MAJOR).$(LUCENE_MINOR).jar
LUCENE_ANALYZERS_JAR=lucene-analyzers-$(LUCENE_MAJOR).$(LUCENE_MINOR).jar
TARFILE_NAME=$(LUCENE_NAME)
-PATCH_FILE_NAME=lucene.patch
+PATCH_FILES=lucene.patch
BUILD_DIR=.
BUILD_ACTION= ${ANT} -buildfile .$/contrib$/analyzers$/build.xml
diff --git a/msfontextract/makefile.mk b/msfontextract/makefile.mk
index 174ab5d0b360..bdd1398f3b46 100644
--- a/msfontextract/makefile.mk
+++ b/msfontextract/makefile.mk
@@ -48,7 +48,7 @@ LIBSALCPPRT=
.ENDIF
TARFILE_NAME=libmspack
-PATCH_FILE_NAME=msfontextract.patch
+PATCH_FILES=msfontextract.patch
ADDITIONAL_FILES=mspack$/makefile.mk mspack$/msfontextract.c mspack$/ministub.c
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.
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index d8a614aadf08..e7c80b9b90ef 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -52,7 +52,7 @@ all:
RAPTORVERSION=$(RAPTOR_MAJOR).4.17
TARFILE_NAME=raptor-$(RAPTORVERSION)
-PATCH_FILE_NAME=..$/$(TARFILE_NAME).patch
+PATCH_FILES=..$/$(TARFILE_NAME).patch
ADDITIONAL_FILES=src/makefile.mk
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index 14122beb98ec..996d7d7433ae 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -52,7 +52,7 @@ all:
RASQALVERSION=0.9.15
TARFILE_NAME=rasqal-$(RASQALVERSION)
-PATCH_FILE_NAME=..$/$(TARFILE_NAME).patch
+PATCH_FILES=..$/$(TARFILE_NAME).patch
ADDITIONAL_FILES=src/makefile.mk
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index e5814fb549bd..f5fc88f8438f 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -52,7 +52,7 @@ all:
REDLANDVERSION=1.0.7
TARFILE_NAME=redland-$(REDLANDVERSION)
-PATCH_FILE_NAME=..$/$(TARFILE_NAME).patch
+PATCH_FILES=..$/$(TARFILE_NAME).patch
ADDITIONAL_FILES=librdf/makefile.mk
diff --git a/rhino/makefile.mk b/rhino/makefile.mk
index 06bc45732f58..24517b6dafd7 100755
--- a/rhino/makefile.mk
+++ b/rhino/makefile.mk
@@ -48,7 +48,7 @@ TARFILE_ROOTDIR=rhino1_5R5
ADDITIONAL_FILES= \
toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java
-PATCH_FILE_NAME=rhino1_5R5.patch
+PATCH_FILES=rhino1_5R5.patch
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
diff --git a/vigra/makefile.mk b/vigra/makefile.mk
index 1f5f6655d6f1..97f6b0e29bf6 100644
--- a/vigra/makefile.mk
+++ b/vigra/makefile.mk
@@ -51,7 +51,7 @@ all:
# --- Files --------------------------------------------------------
TARFILE_NAME=vigra1.4.0
-PATCH_FILE_NAME=$(TARFILE_NAME).patch
+PATCH_FILES=$(TARFILE_NAME).patch
CONFIGURE_DIR=
CONFIGURE_ACTION=