INTEGRATION: CWS ause095 (1.5.6); FILE MERGED

2008/06/25 09:45:53 hjs 1.5.6.1: #i90789# - referencing patch with relative path from current directory
This commit is contained in:
Ivo Hinkelmann 2008-07-17 12:36:41 +00:00
parent df62dc0789
commit 47829d749f
3 changed files with 6 additions and 6 deletions

View file

@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.5 $
# $Revision: 1.6 $
#
# This file is part of OpenOffice.org.
#
@ -51,7 +51,7 @@ TARFILE_NAME=$(TARGET)
TARFILE_ROOTDIR=$(TARGET)
PATCH_FILE_NAME=patches$/$(TARGET).patch
PATCH_FILE_NAME=$(PRJ)$/patches$/$(TARGET).patch
CONVERTFILES=build.xml\
build.properties

View file

@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.5 $
# $Revision: 1.6 $
#
# This file is part of OpenOffice.org.
#
@ -51,7 +51,7 @@ TARFILE_NAME=$(TARGET)
TARFILE_ROOTDIR=$(TARGET)
PATCH_FILE_NAME=patches$/$(TARGET).patch
PATCH_FILE_NAME=$(PRJ)$/patches$/$(TARGET).patch
CONVERTFILES=build.xml\
build.properties

View file

@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.5 $
# $Revision: 1.6 $
#
# This file is part of OpenOffice.org.
#
@ -51,7 +51,7 @@ TARFILE_NAME=$(TARGET)
TARFILE_ROOTDIR=$(TARGET)
PATCH_FILE_NAME=patches$/$(TARGET).patch
PATCH_FILE_NAME=$(PRJ)$/patches$/$(TARGET).patch
CONVERTFILES=build.xml\
build.properties