diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-07-15 22:58:52 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-07-30 11:26:04 +0200 |
| commit | 789559074f04dcf431c86b231b9cd7f6c9e66d9f (patch) | |
| tree | 1aa6f278972f989f10138c03f7ed07364b79d9f9 /Makefile.top | |
| parent | 0c9a5e5ce102a151012a33fe82ba4f942f95c135 (diff) | |
let make dev-install do something useful on MSVC
Forcing creation of second installation set is perhaps not ideal,
but i have no idea how that installer perl crud work and
at least it gives something to run tests against.
Change-Id: I506160013de23f76128c9e39b4f3bacc6e32cc7a
(cherry picked from commit 0ec45dc41dd4872482b817387f253d6fab6bf20c)
Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'Makefile.top')
| -rw-r--r-- | Makefile.top | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.top b/Makefile.top index e2d9d12c8f53..18465169d0ea 100644 --- a/Makefile.top +++ b/Makefile.top @@ -392,7 +392,8 @@ endif build: build-packimages ifeq ($(OS_FOR_BUILD),WNT) - cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl + cd instsetoo_native && unset MAKEFLAGS && \ + $(SOLARENV)/bin/build.pl FORCE2ARCHIVE=TRUE else cd instsetoo_native && unset MAKEFLAGS && \ $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) -- -P$(GMAKE_PARALLELISM) @@ -423,12 +424,17 @@ install-strip: dev-install: build @rm -rf $(DEVINSTALLDIR) @mkdir $(DEVINSTALLDIR) +ifeq ($(OS_FOR_BUILD),WNT) + 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 ifeq ($(DISABLE_LINKOO),TRUE) @ooinstall $(DEVINSTALLDIR)/opt @install-gdb-printers -L else @ooinstall -l $(DEVINSTALLDIR)/opt endif +endif @rm -f $(SRCDIR)/install && ln -s $(DEVINSTALLDIR)/opt/ $(SRCDIR)/install distro-pack-install: install |