mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

normalize values of USE_LIBRARY_BIN_TAR

Browse Source 
Change-Id: I1101b87d3f34169f985924f8b867511e68ed5b66
This commit is contained in:
Michael Stahl
2014-03-10 23:04:47 +01:00
parent 7e73edc5b6
commit 7f61c038a0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@@ -2090,9 +2090,9 @@ dnl Do we want to use pre-build binary tarball for recompile
dnl ===================================================================
if test "$enable_library_bin_tar" = "yes" ; then
USE_LIBRARY_BIN_TAR=YES
USE_LIBRARY_BIN_TAR=TRUE
else
USE_LIBRARY_BIN_TAR=NO
USE_LIBRARY_BIN_TAR=
fi
AC_SUBST(USE_LIBRARY_BIN_TAR)

2
solenv/gbuild/UnpackedTarball.mk
View File

@@ -253,7 +253,7 @@ endef
#
# gb_UnpackedTarball_set_tarball unpacked tarball-name
define gb_UnpackedTarball_set_tarball
$(if $(findstring YES,$(USE_LIBRARY_BIN_TAR)),
$(if $(USE_LIBRARY_BIN_TAR),
$(if $(4),
$(if $(shell "$(SRCDIR)/solenv/bin/bin_library_info.sh" -l "$(gb_UnpackedTarget_TARFILE_LOCATION)" -o "$(4)" -b "$(BUILDDIR)" -s "$(SRCDIR)" -t "$(2)" -m verify -p "$(OS)_$(CPUNAME)"),
$(call gb_UnpackedTarball_set_tarball_internal,$(1),$(shell "$(SRCDIR)/solenv/bin/bin_library_info.sh" -l "$(gb_UnpackedTarget_TARFILE_LOCATION)" -o "$(4)" -b "$(BUILDDIR)" -s "$(SRCDIR)" -t "$(2)" -m verify -p "$(OS)_$(CPUNAME)"),$(3),$(4),in),\