instsetoo_native/CustomTarget_install.mk | 5 +++++
solenv/bin/modules/installer/epmfile.pm | 2 +-
solenv/bin/modules/installer/globals.pm | 2 ++
solenv/bin/modules/installer/parameter.pm | 5 +++++
4 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 703cf9193e7fa345f9535045bd0dbcacbfa026d8
Author: David Tardon <dtar...@redhat.com>
Date: Wed Jul 24 08:50:45 2013 +0200
look for find-requires-gnome.sh in the right path
... and make sure it exists as well.
Change-Id: Ia895d93d2755a2b0b9d87601ace54ee47b5c1b80
(cherry picked from commit 8bae88b146529d469742b33ead50b3a01457e313)
Signed-off-by: Fridrich Å trba <fridrich.st...@bluewin.ch>
Reviewed-on: https://gerrit.libreoffice.org/5080
Reviewed-by: Fridrich Strba <fridr...@documentfoundation.org>
Tested-by: Fridrich Strba <fridr...@documentfoundation.org>
diff --git a/instsetoo_native/CustomTarget_install.mk
b/instsetoo_native/CustomTarget_install.mk
index 573b9c6..c8317dc 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -29,6 +29,11 @@ $(eval $(call
gb_CustomTarget_register_targets,instsetoo_native/install,\
$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: \
$(SOLARENV)/bin/make_installer.pl \
$(foreach ulf,$(instsetoo_ULFLIST),$(call
gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/$(ulf).ulf) \
+ $(if $(filter-out WNT,$(OS)),\
+ $(addprefix $(call
gb_CustomTarget_get_workdir,instsetoo_native/install)/,\
+ bin/find-requires-gnome.sh \
+ bin/find-requires-x11.sh) \
+ ) \
$(call gb_Postprocess_get_target,AllModulesButInstsetNative)
$(call
gb_CustomTarget_get_workdir,instsetoo_native/install)/bin/find-requires-%.sh:
$(SRCDIR)/instsetoo_native/inc_openoffice/unix/find-requires-%.sh
diff --git a/solenv/bin/modules/installer/epmfile.pm
b/solenv/bin/modules/installer/epmfile.pm
index 4ea85b6..c1dd768 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -1702,7 +1702,7 @@ sub prepare_packages
if ( $installer::globals::isrpmbuild )
{
set_topdir_in_specfile($changefile, $filename, $newepmdir);
- set_autoprovreq_in_specfile($changefile,
$onepackage->{'findrequires'}, "$installer::globals::unpackpath" . "/bin");
+ set_autoprovreq_in_specfile($changefile,
$onepackage->{'findrequires'}, "$installer::globals::workpath" . "/bin");
set_packager_in_specfile($changefile);
if ( is_extension_package($changefile) ) {
set_prereq_in_specfile($changefile); }
set_license_in_specfile($changefile, $variableshashref);
diff --git a/solenv/bin/modules/installer/globals.pm
b/solenv/bin/modules/installer/globals.pm
index 7cd6e92..197b1ca 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -58,6 +58,8 @@ BEGIN
$ismacbuild = 0;
$ismacdmgbuild = 0;
$unpackpath = "";
+ $workpath = ""; # installation working dir; some helper scripts are
+ # placed here by gbuild
$idttemplatepath = "";
$idtlanguagepath = "";
$buildid = "Not set";
diff --git a/solenv/bin/modules/installer/parameter.pm
b/solenv/bin/modules/installer/parameter.pm
index 2a98dd8..eef8d3e 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -341,6 +341,11 @@ sub setglobalvariables
$installer::globals::unpackpath = cwd();
}
+ if ($installer::globals::workpath eq "") # workpath not set
+ {
+ $installer::globals::workpath = cwd();
+ }
+
if ( $installer::globals::localunpackdir ne "" ) {
$installer::globals::unpackpath = $installer::globals::localunpackdir; }
if (!($installer::globals::unpackpath eq ""))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
