[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_install.mk solenv/bin solenv/CustomTarget_versionlist.mk solenv/Package_minor.mk

[Norbert Thiebaud]

 instsetoo_native/CustomTarget_install.mk    |    2 +-
 solenv/CustomTarget_versionlist.mk          |    4 ++--
 solenv/Package_minor.mk                     |    2 +-
 solenv/bin/modules/installer/scriptitems.pm |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 4038f2467cc97ab964880dd39e1227fcf4f42a7b
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Wed Feb 27 23:17:37 2013 -0600

    fix: BUILDDIR is not always SRCDIR
    
    Change-Id: I6028fe295e467aa448d8503097be0c80a42908ed

diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index 1135616..288bbbd 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -81,7 +81,7 @@ $(call instsetoo_native_msitemplates,$(1))
 cd $(dir $@) \
 $(foreach pkgformat,$(5),\
 && $(PERL) -w $< \
-	-f $(SRCDIR)/instsetoo_native/util/openoffice.lst \
+	-f $(BUILDDIR)/instsetoo_native/util/openoffice.lst \
 	-l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \
 	-p LibreOffice$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)$(3) \
 	-u $(instsetoo_OUT) \
diff --git a/solenv/CustomTarget_versionlist.mk b/solenv/CustomTarget_versionlist.mk
index f7706ac..5ffed0b 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 7ea056a..70b0faf 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 77fa1d3..cd4b141 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 . ")";
     }