Author: damjan
Date: Sun Jan 8 19:24:20 2017
New Revision: 1777901
URL: http://svn.apache.org/viewvc?rev=1777901&view=rev
Log:
Only set the BUILD_VER_STRING define if it is available
as an environment variable and non-empty. At least the
Windows build breaks without this when --with-build-version
is not used.
Patch by: me
Modified:
openoffice/trunk/main/cui/Library_cui.mk
Modified: openoffice/trunk/main/cui/Library_cui.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/cui/Library_cui.mk?rev=1777901&r1=1777900&r2=1777901&view=diff
==============================================================================
--- openoffice/trunk/main/cui/Library_cui.mk (original)
+++ openoffice/trunk/main/cui/Library_cui.mk Sun Jan 8 19:24:20 2017
@@ -33,8 +33,11 @@ $(eval $(call gb_Library_set_include,cui
-I$(SRCDIR)/cui/source/inc \
))
+ifneq ($(BUILD_VER_STRING),)
+$(eval $(call gb_Library_add_defs,cui,-DBUILD_VER_STRING="$(BUILD_VER_STRING"))
+endif
+
$(eval $(call gb_Library_add_defs,cui,\
- -DBUILD_VER_STRING="$(BUILD_VER_STRING)" \
-DCOPYRIGHT_YEAR=$(shell perl -e 'use POSIX qw(strftime); print
strftime("%Y", gmtime($$ENV{SOURCE_DATE_EPOCH} || time));') \
))
