diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-07-22 16:26:29 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-07-30 11:40:01 +0200 |
| commit | 1b60abb34466d4604985efeb56d81bc4ac604c2e (patch) | |
| tree | 37b025154b9e70b19d5a01355e31f2446d1550dc /Makefile.top | |
| parent | cf5b1cd3f8d9ac9cb8d05beeb052d46634ade53b (diff) | |
'make build' again generates .msi on windows
This is a partial revert of 0ec45dc41dd4872482b817387f253d6fab6bf20c ,
mainly for tinderbox nightlies. The .zip for dev-install is built
only in dev-install target. But IMO the build target is broken
this way too, I don't see why the .msi has to be built already there
and not in some install or make-msi or whatever target (it's pointless
in build target for a developer build).
Change-Id: Ifd63066499b67fa446127193b243d893d497b451
(cherry picked from commit 1bdb0801eb9315a3f844aa0200f001e667953483)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'Makefile.top')
| -rw-r--r-- | Makefile.top | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.top b/Makefile.top index 18465169d0ea..745144523c59 100644 --- a/Makefile.top +++ b/Makefile.top @@ -392,8 +392,7 @@ endif build: build-packimages ifeq ($(OS_FOR_BUILD),WNT) - cd instsetoo_native && unset MAKEFLAGS && \ - $(SOLARENV)/bin/build.pl FORCE2ARCHIVE=TRUE + cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl else cd instsetoo_native && unset MAKEFLAGS && \ $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) -- -P$(GMAKE_PARALLELISM) @@ -425,6 +424,7 @@ dev-install: build @rm -rf $(DEVINSTALLDIR) @mkdir $(DEVINSTALLDIR) ifeq ($(OS_FOR_BUILD),WNT) + cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl FORCE2ARCHIVE=TRUE unzip -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice_Dev/archive/install/en-US/LibO*_install-arc_en-US.zip" mv "$(DEVINSTALLDIR)"/LibO*_install-arc_en-US/* "$(DEVINSTALLDIR)"/opt else |