diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-01-03 09:13:53 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-01-03 09:13:53 +0000 |
| commit | 3cd8b9494570c510d056a4b8806295444da23b27 (patch) | |
| tree | a9d771e0b02753d15f66ec1c4a9d4e2e749a86f4 /instsetoo_native/util/makefile.mk | |
| parent | 707ea835b2d905a88da55059eb4efa12bfea9035 (diff) | |
INTEGRATION: CWS cloph05 (1.61.22); FILE MERGED
2006/12/21 12:35:36 cloph 1.61.22.1: Issue number: #i#72840#
Don't require gnu cp when building on Mac. The default (POSIX) cp works fine as well.
Diffstat (limited to 'instsetoo_native/util/makefile.mk')
| -rw-r--r-- | instsetoo_native/util/makefile.mk | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index ab6b3de2918a..7a8e388c6ffa 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.61 $ +# $Revision: 1.62 $ # -# last change: $Author: obo $ $Date: 2006-10-13 10:37:05 $ +# last change: $Author: hr $ $Date: 2007-01-03 10:13:53 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -160,7 +160,10 @@ MSILANGPACKTEMPLATEDIR=$(MISC)$/ooolangpack$/msi_templates MSIURETEMPLATEDIR=$(MISC)$/ure$/msi_templates MSISDKOOTEMPLATEDIR=$(MISC)$/sdkoo$/msi_templates -ADDDEPS=$(NOLOGOSPLASH) hack_msitemplates +ADDDEPS=$(NOLOGOSPLASH) +.IF "$(OS)" == "WNT" +ADDDEPS+=hack_msitemplates +.ENDIF $(foreach,i,$(alllangiso) openoffice_$i) : $(ADDDEPS) @@ -200,8 +203,8 @@ openoffice_% : +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -packagelist $(PRJ)$/inc_openoffice$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -destdir $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))_inprogress$/ -simple staging +$(RM) $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))$/gid_* +-$(MKDIR) $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))$/staging$/.background - +$(GNUCOPY) -u $(PRJ)$/res/osxdndinstall.png $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))$/staging$/.background$/background.png - +$(GNUCOPY) -u $(PRJ)$/res/DS_Store $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))$/staging$/.DS_Store + +$(COPY) $(PRJ)$/res/osxdndinstall.png $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))$/staging$/.background$/background.png + +$(COPY) $(PRJ)$/res/DS_Store $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))$/staging$/.DS_Store +cd $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b)) && hdiutil makehybrid -hfs -hfs-openfolder staging staging \ -hfs-volume-name OpenOffice.org -ov -o tmp && hdiutil convert -ov -format UDZO tmp.dmg \ -o $(subst,$(@:s/_/ /:1),OpenOffice.org-$(shell sed -n '/^OpenOffice$$/,/^}$$/ s/.*PACKAGEVERSION //p' openoffice.lst) $(@:b)) && $(RM) tmp.dmg |