diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-02-27 23:17:37 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-02-27 23:24:41 -0600 |
| commit | 4038f2467cc97ab964880dd39e1227fcf4f42a7b (patch) | |
| tree | 3f7e4fb8c70b3b3e6160641071eb64476e3955f0 /solenv | |
| parent | db36904f41b577f61033f7c4b6df922045928b86 (diff) | |
fix: BUILDDIR is not always SRCDIR
Change-Id: I6028fe295e467aa448d8503097be0c80a42908ed
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/CustomTarget_versionlist.mk | 4 | ||||
| -rw-r--r-- | solenv/Package_minor.mk | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/scriptitems.pm | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/solenv/CustomTarget_versionlist.mk b/solenv/CustomTarget_versionlist.mk index f7706ac839fe..5ffed0bbc0d5 100644 --- a/solenv/CustomTarget_versionlist.mk +++ b/solenv/CustomTarget_versionlist.mk @@ -27,12 +27,12 @@ $(eval $(call gb_CustomTarget_CustomTarget,solenv/versionlist)) -include $(SRCDIR)/solenv/inc/minor.mk +include $(BUILDDIR)/solenv/inc/minor.mk $(call gb_CustomTarget_get_target,solenv/versionlist) : $(call gb_CustomTarget_get_workdir,solenv/versionlist)/versionlist.hrc $(call gb_CustomTarget_get_workdir,solenv/versionlist)/versionlist.hrc : \ - $(SRCDIR)/solenv/inc/minor.mk \ + $(BUILDDIR)/solenv/inc/minor.mk \ | $(call gb_CustomTarget_get_workdir,solenv/versionlist)/.dir $(call gb_CustomTarget_get_workdir,solenv/versionlist)/versionlist.hrc : diff --git a/solenv/Package_minor.mk b/solenv/Package_minor.mk index 7ea056ae0b88..70b0faf90aa2 100644 --- a/solenv/Package_minor.mk +++ b/solenv/Package_minor.mk @@ -25,7 +25,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_Package_Package,solenv_minor_mk,$(SRCDIR)/solenv/inc)) +$(eval $(call gb_Package_Package,solenv_minor_mk,$(BUILDDIR)/solenv/inc)) $(eval $(call gb_Package_add_file,solenv_minor_mk,inc/$(UPD)minor.mk,minor.mk)) $(eval $(call gb_Package_add_file,solenv_minor_mk,inc/minormkchanged.flg,minor.mk)) diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index 77fa1d3619b9..cd4b1413a85e 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -672,7 +672,7 @@ sub replace_setup_variables if ( $localbuild =~ /^\s*(\w+?)(\d+)\s*$/ ) { $localbuild = $2; } # using "680" instead of "src680" - my $buildidstring = `git log -n 1 --pretty=format:"%H"`; + my $buildidstring = `cd $ENV{'SRCDIR'} 2>&1 >/dev/null && git log -n 1 --pretty=format:"%H"`; if ($? || !$buildidstring) { $buildidstring = $localbuild . $localminor . "(Build:" . $installer::globals::buildid . ")"; } |