diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-08-20 14:46:07 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-08-20 14:46:07 +0000 |
| commit | a060d9e55105ce8e16baba9b5465f809471268fa (patch) | |
| tree | b60a2aa5bab2cb98c9256f52fab902b7e160d53c /instsetoo_native | |
| parent | 0c99af40cc023f820a8ee5623adf21cddc3ea26d (diff) | |
INTEGRATION: CWS native104 (1.68.40); FILE MERGED
2007/07/30 12:22:52 is 1.68.40.1: #i80089# ooodev with Java GUI installer
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/util/makefile.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index 044a6dbe2412..468872abfacd 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.70 $ +# $Revision: 1.71 $ # -# last change: $Author: ihi $ $Date: 2007-08-20 15:32:56 $ +# last change: $Author: ihi $ $Date: 2007-08-20 15:46:07 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -253,7 +253,7 @@ openofficedev_%{$(PKGFORMAT:^".")} : .ELSE # "$(PKGFORMAT)"!="" openofficedev_% : .ENDIF # "$(PKGFORMAT)"!="" - $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -packagelist $(PRJ)$/inc_openoffice$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH)) + $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -packagelist $(PRJ)$/inc_openoffice$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -addchildprojects $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH)) $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH).update.xml openofficedevarchive_% : @@ -345,7 +345,7 @@ brofficedev_%{$(PKGFORMAT:^".")} : .ELSE # "$(PKGFORMAT)"!="" brofficedev_% : .ENDIF # "$(PKGFORMAT)"!="" - +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice_Dev -packagelist $(PRJ)$/inc_openoffice$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH)) + +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice_Dev -packagelist $(PRJ)$/inc_openoffice$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -addchildprojects $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH)) .IF "$(PKGFORMAT)"!="" $(foreach,i,$(alllangiso) broolanguagepack_$i) : $$@{$(PKGFORMAT:^".")} |