diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-03-22 10:02:24 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-03-22 10:02:24 +0000 |
| commit | d291493b0e527b05c5e170a65ffe13c9fa3375db (patch) | |
| tree | 099e4b96f70a91ec938cff26ec701b58f80733b3 /instsetoo_native | |
| parent | 60331f538e7c628d9453be5e68e95187f14bfcf6 (diff) | |
INTEGRATION: CWS cairofixes01 (1.52.42); FILE MERGED
2006/03/06 09:05:26 thb 1.52.42.2: #i62739# Corrected typo
2006/03/03 11:26:08 thb 1.52.42.1: #i62739# Changed line of products to pack to be sensitive to BUILD_TYPE (at least for the ODK case)
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/util/makefile.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index 2bdb0d0ea447..bfb085a48b78 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.54 $ +# $Revision: 1.55 $ # -# last change: $Author: obo $ $Date: 2006-03-22 10:55:10 $ +# last change: $Author: obo $ $Date: 2006-03-22 11:02:24 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -97,7 +97,11 @@ ALLTAR : $(LOCALPYFILES) @echo "No EPM: do no packaging at this stage" .ELSE # "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"=="" .IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"=="" +.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE):s/ODK//" +ALLTAR : openoffice +.ELSE ALLTAR : openoffice sdkoo_en-US ure_en-US +.ENDIF .ELSE # "$(UPDATER)"=="" || "$(USE_PACKAGER)"=="" ALLTAR : updatepack .ENDIF # "$(UPDATER)"=="" || "$(USE_PACKAGER)"=="" |