strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make this work also if BUILDDIR != SRCDIR

Browse source 
Change-Id: I992020936cc39e5a6b04cd507b61853043a19b49
This commit is contained in:
Matúš Kukan 2013-09-12 10:24:44 +02:00
parent 96e1446f32
commit 5fd86fb2a3
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
instsetoo_native/CustomTarget_setup.mk
View file

@ -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)' \

2
ios/CustomTarget_LibreOffice_app.mk
View file

@ -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)