diff options
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | desktop/Package_branding.mk | 2 | ||||
| -rw-r--r-- | instsetoo_native/CustomTarget_install.mk | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index be7ddd7f2b00..b2ab0ef12792 100644 --- a/configure.ac +++ b/configure.ac @@ -1983,10 +1983,10 @@ dnl =================================================================== AC_MSG_CHECKING([whether build target is Release Build]) if test "$enable_release_build" = "" -o "$enable_release_build" = "no"; then AC_MSG_RESULT([no]) - ENABLE_RELEASE_BUILD="FALSE" + ENABLE_RELEASE_BUILD= else AC_MSG_RESULT([yes]) - ENABLE_RELEASE_BUILD="TRUE" + ENABLE_RELEASE_BUILD=TRUE fi AC_SUBST(ENABLE_RELEASE_BUILD) @@ -5112,11 +5112,11 @@ find_msms() msmdir=`cygpath -d "$msmdir"` msmdir=`cygpath -u "$msmdir"` if test -z "$msmdir"; then - if test "$ENABLE_RELEASE_BUILD" = "FALSE" ; then + if test "$ENABLE_RELEASE_BUILD" = "TRUE" ; then + AC_MSG_ERROR([Merge modules not found in $msmdir]) + else AC_MSG_WARN([Merge modules not found in $msmdir]) msmdir="" - else - AC_MSG_ERROR([Merge modules not found in $msmdir]) fi else msms="Microsoft_VC${VCVER}_CRT_x86.msm" @@ -11191,7 +11191,7 @@ AC_MSG_CHECKING([which themes to include]) # if none given use default subset of available themes if test "x$with_theme" = "x" -o "x$with_theme" = "xyes"; then with_theme="crystal default hicontrast oxygen tango sifr" - test "$ENABLE_RELEASE_BUILD" = "FALSE" && with_theme="$with_theme tango_testing" + test -z "$ENABLE_RELEASE_BUILD" && with_theme="$with_theme tango_testing" fi WITH_THEMES="" diff --git a/desktop/Package_branding.mk b/desktop/Package_branding.mk index c8739fab3ae5..5d7dbf5c03ed 100644 --- a/desktop/Package_branding.mk +++ b/desktop/Package_branding.mk @@ -14,7 +14,7 @@ $(eval $(call gb_Package_set_outdir,desktop_branding,$(INSTDIR))) $(eval $(call gb_Package_add_files,desktop_branding,$(LIBO_ETC_FOLDER),\ $(foreach image,$(filter $(BRAND_INTRO_IMAGES),$(DEFAULT_BRAND_IMAGES)),\ $(if $(filter intro.png,$(image)),\ - $(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),brand,brand_dev)/$(image),\ + $(if $(ENABLE_RELEASE_BUILD),brand,brand_dev)/$(image),\ brand/$(image) \ ) \ ) \ diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 5045b5ae9717..0aeb5f7c9c08 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -79,7 +79,7 @@ $(foreach pkgformat,$(5),\ && $(PERL) -w $< \ -f $(BUILDDIR)/instsetoo_native/util/openoffice.lst \ -l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \ - -p LibreOffice$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)$(3) \ + -p LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)$(3) \ -u $(instsetoo_OUT) \ -buildid $(LIBO_VERSION_PATCH) \ $(if $(filter WNT,$(OS)), \ @@ -97,12 +97,12 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: rm -rf $(instsetoo_OUT) ifeq (TRUE,$(LIBO_DEV_INSTALL)) $(call instsetoo_native_install_command,openoffice,en-US,,,archive) - unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)/archive/install/en-US/LibreOffice*_archive.zip + unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)/archive/install/en-US/LibreOffice*_archive.zip mv $(DEVINSTALLDIR)/LibreOffice*_archive/* $(DEVINSTALLDIR)/opt rmdir $(DEVINSTALLDIR)/LibreOffice*_archive ifeq (ODK,$(filter ODK,$(BUILD_TYPE))) $(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,archive) - unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip + unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip mv $(DEVINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK/sdk \ $(DEVINSTALLDIR)/opt/ rmdir $(DEVINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK |