From b64816d455555966ae6a5654005bba2ddc2dd50c Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Thu, 19 Feb 2009 07:29:28 +0000
Subject: 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)

---
 icu/makefile.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'icu')

diff --git a/icu/makefile.mk b/icu/makefile.mk
index b042ede5a29e..5a15d4274e25 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -48,7 +48,7 @@ TARFILE_NAME=icu-$(ICU_MAJOR).$(ICU_MINOR)
 .ENDIF
 TARFILE_ROOTDIR=icu
 
-PATCH_FILE_NAME=${TARFILE_NAME}.patch
+PATCH_FILES=${TARFILE_NAME}.patch
 
 # ADDITIONAL_FILES=
 
@@ -243,10 +243,10 @@ OUT2BIN= \
 .INCLUDE :	target.mk
 .INCLUDE :	tg_ext.mk
 
-.IF "$(BINARY_PATCH_FILE_NAME)"!=""
+.IF "$(BINARY_PATCH_FILES)"!=""
 
 $(PACKAGE_DIR)$/so_add_binary :  $(PACKAGE_DIR)$/$(ADD_FILES_FLAG_FILE)
-    cd $(PACKAGE_DIR) && gunzip -c $(BACK_PATH)$(BINARY_PATCH_FILE_NAME) | tar $(TAR_EXCLUDE_SWITCH) -xvf -
+    cd $(PACKAGE_DIR) && gunzip -c $(BACK_PATH)$(BINARY_PATCH_FILES) | tar $(TAR_EXCLUDE_SWITCH) -xvf -
     $(TOUCH) $(PACKAGE_DIR)$/so_add_binary
 
 $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/so_add_binary
-- 
cgit