diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-07-18 07:01:29 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-07-18 07:01:29 +0000 |
| commit | 04a7988f6864f144f679b960bd343a0828dffc14 (patch) | |
| tree | b2d147af5d588fe6ebd5e821c58c305c6ed8646c | |
| parent | 23313e5cff4c02b006dd487e68b9e2ce5f9c1289 (diff) | |
INTEGRATION: CWS ause082 (1.76.70); FILE MERGED
2007/07/16 15:11:25 hjs 1.76.70.1: #i79554# fix name clash
| -rw-r--r-- | solenv/inc/tg_ext.mk | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk index 1524f8da3ba8..7a8392ef6392 100644 --- a/solenv/inc/tg_ext.mk +++ b/solenv/inc/tg_ext.mk @@ -4,9 +4,9 @@ # # $RCSfile: tg_ext.mk,v $ # -# $Revision: 1.76 $ +# $Revision: 1.77 $ # -# last change: $Author: rt $ $Date: 2007-04-26 13:57:21 $ +# last change: $Author: obo $ $Date: 2007-07-18 08:01:29 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -189,7 +189,7 @@ $(PACKAGE_DIR)$/$(ADD_FILES_FLAG_FILE) : $(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) $(T_ #patch $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) : $(PACKAGE_DIR)$/$(ADD_FILES_FLAG_FILE) .IF "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"=="" - echo no patch needed... + @echo no patch needed... $(TOUCH) $@ .ELSE # "$(PATCH_FILE_NAME)"=="none" || "$(PATCH_FILE_NAME)"=="" .IF "$(GUI)"=="WNT" @@ -217,17 +217,17 @@ $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) : $(PACKAGE_DIR)$/$(ADD_FILES_FLAG_FILE) .ENDIF # "$(T_ADDITIONAL_FILES)"!="" .IF "$(CONVERTFILES)"!="" -$(MISC)$/convert_unx_flag : $(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) - $(CONVERT) unix $(foreach,i,$(CONVERTFILES) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i) && $(TOUCH) $(MISC)$/convert_unx_flag +$(MISC)$/$(TARGET)_convert_unx_flag : $(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) + $(CONVERT) unix $(foreach,i,$(CONVERTFILES) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i) && $(TOUCH) $(MISC)$/$(TARGET)_convert_unx_flag -$(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) : $(MISC)$/convert_unx_flag +$(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) : $(MISC)$/$(TARGET)_convert_unx_flag -$(MISC)$/convert_dos_flag : $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) - $(CONVERT) dos $(foreach,i,$(CONVERTFILES) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i) && $(TOUCH) $(MISC)$/convert_dos_flag +$(MISC)$/$(TARGET)_convert_dos_flag : $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) + $(CONVERT) dos $(foreach,i,$(CONVERTFILES) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/$i) && $(TOUCH) $(MISC)$/$(TARGET)_convert_dos_flag -$(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(MISC)$/convert_dos_flag +$(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(MISC)$/$(TARGET)_convert_dos_flag -patch : $(MISC)$/convert_dos_flag +patch : $(MISC)$/$(TARGET)_convert_dos_flag .ENDIF # "$(CONVERTFILES)"!="" |