diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-10-15 17:10:01 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-10-15 17:57:16 +0200 |
| commit | 8fc7e560db11f424362c8effdeb61eb8d1526256 (patch) | |
| tree | e0c6e491ec5ca24bce891cdf39068b835596f21e /instsetoo_native/Module_instsetoo_native.mk | |
| parent | cc2a405915e82c4b332dd25457f76704dc536d7f (diff) | |
Make building installation sets depend on --with-package-format=...
...instead of inconsitently having it depend on --enable-epm for some platforms
and having it always enabled on Windows. Only Android and iOS are presumably
still special and build any installation sets in their specific modules and
outside instsetoo_native.
One consequence is that for a non-Windows --enable-online-update
--without-package-format build, instdir's version ini-file contains an
UpdateURL that ends in just "?pkgfmt=" without an actual format identifier.
However, checking whether the update feature would actually work is difficult
for most such developer builds, anyway.
Change-Id: If14fcf0b2e612499811e8a6e067a854bda612c42
Diffstat (limited to 'instsetoo_native/Module_instsetoo_native.mk')
| -rw-r--r-- | instsetoo_native/Module_instsetoo_native.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/instsetoo_native/Module_instsetoo_native.mk b/instsetoo_native/Module_instsetoo_native.mk index dc9e4a5493d9..ea540ebc6a1b 100644 --- a/instsetoo_native/Module_instsetoo_native.mk +++ b/instsetoo_native/Module_instsetoo_native.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,instsetoo_native)) -ifneq (,$(filter WNT,$(OS))$(filter-out NO,$(EPM))) +ifneq (,$(PKGFORMAT)$(filter TRUE,$(LIBO_TEST_INSTALL))) $(eval $(call gb_Module_add_targets,instsetoo_native,\ CustomTarget_install \ |