diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-08-16 14:44:37 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-08-16 14:44:37 +0200 |
| commit | 19990a9c5c5761687f757456015cb26d46d4830b (patch) | |
| tree | 3484c8f19cdf7ee0c7c919e2c8148a42c84ce629 /Makefile.top | |
| parent | 5ac575ee3e10961177263d8900073d046af66176 (diff) | |
Fix Windows dev-install for --enable-release-build, --with-lang=... etc.
Introduced special token LIBO_DEV_INSTALL=TRUE to communicate what install set
to build from Makefile.top's dev-install target to
instsetoo_native/util/makefile.mk. Somewhat arbitrarily, always use a "release"
install set regardless of --enable-release-build (the dev-install set is used
for "make check," and it is safer to test "release" install sets in
--disable-release-build builds than the other way around, should those builds
ever start to deviate significantly).
The "always build a defaul-laguage openoffice product" logic had been obsoleted
a long time ago already.
Change-Id: I64ec87a0b8dc6fe81cab5531c43e29db3f5128af
Diffstat (limited to 'Makefile.top')
| -rw-r--r-- | Makefile.top | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.top b/Makefile.top index d9ddea4c3434..b23b5be1a0dd 100644 --- a/Makefile.top +++ b/Makefile.top @@ -436,8 +436,8 @@ dev-install: build @rm -rf $(DEVINSTALLDIR) @mkdir $(DEVINSTALLDIR) ifeq ($(OS_FOR_BUILD),WNT) - cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl PKGFORMAT=archive - unzip -q -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice_Dev/archive/install/en-US/LibO*_install-arc_en-US.zip" + cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl LIBO_DEV_INSTALL=TRUE + unzip -q -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibO*_install-arc_en-US.zip" mv "$(DEVINSTALLDIR)"/LibO*_install-arc_en-US/* "$(DEVINSTALLDIR)"/opt else ifeq ($(DISABLE_LINKOO),TRUE) @@ -453,8 +453,8 @@ install-tb: @rm -rf $(DEVINSTALLDIR) @mkdir $(DEVINSTALLDIR) ifeq ($(OS_FOR_BUILD),WNT) - cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl PKGFORMAT=archive - unzip -q -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice_Dev/archive/install/en-US/LibO*_install-arc_en-US.zip" + cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl LIBO_DEV_INSTALL=TRUE + unzip -q -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibO*_install-arc_en-US.zip" mv "$(DEVINSTALLDIR)"/LibO*_install-arc_en-US/* "$(DEVINSTALLDIR)"/opt else @ooinstall $(DEVINSTALLDIR)/opt |