From 5fd86fb2a3b91a4ab2c6610051db13a21119540a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= Date: Thu, 12 Sep 2013 10:24:44 +0200 Subject: [PATCH] make this work also if BUILDDIR != SRCDIR Change-Id: I992020936cc39e5a6b04cd507b61853043a19b49 --- instsetoo_native/CustomTarget_setup.mk | 2 +- ios/CustomTarget_LibreOffice_app.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index a4c88930fe5c..8556ff58b059 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -130,7 +130,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ echo '[Version]' \ && echo 'AllLanguages=$(if $(gb_WITH_LANG),$(gb_WITH_LANG),en-US)' \ && echo 'BuildVersion=$(BUILD_VER_STRING)' \ - && echo 'buildid=$(shell git log -1 --format=%H)' \ + && echo 'buildid=$(shell cd $(SRCDIR) && git log -1 --format=%H)' \ && echo 'ExtensionUpdateURL=http://updateexte.libreoffice.org/ExtensionUpdateService/check.Update' \ && echo 'ProductMajor=$(LIBO_VERSION_MAJOR)$(LIBO_VERSION_MINOR)$(LIBO_VERSION_MICRO)' \ && echo 'ProductMinor=$(LIBO_VERSION_PATCH)' \ diff --git a/ios/CustomTarget_LibreOffice_app.mk b/ios/CustomTarget_LibreOffice_app.mk index bd4dacbcdcdf..fbc385da7402 100644 --- a/ios/CustomTarget_LibreOffice_app.mk +++ b/ios/CustomTarget_LibreOffice_app.mk @@ -44,7 +44,7 @@ ifeq ($(EXECUTABLE_NAME),LibreOffice) $(call gb_CustomTarget_get_target,ios/LibreOffice_app) : $(SCRIPT_OUTPUT_FILE_0) appdir=$(dir $(SCRIPT_OUTPUT_FILE_0)) -buildid=$(shell git log -1 --format=%H) +buildid=$(shell cd $(SRCDIR) && git log -1 --format=%H) $(SCRIPT_OUTPUT_FILE_0) : $(call gb_Executable_get_target,LibreOffice) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2)