diff options
| -rw-r--r-- | instsetoo_native/CustomTarget_install.mk | 5 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/epmfile.pm | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/globals.pm | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/parameter.pm | 5 |
4 files changed, 13 insertions, 1 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index e3a52f2cd1fb..ffedb20c49f7 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 4ea85b68a375..c1dd768b797e 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 cb58cdc04b3a..2940407c0b81 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -59,6 +59,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 4475ec47f788..0cc6e9e0c753 100644 --- a/solenv/bin/modules/installer/parameter.pm +++ b/solenv/bin/modules/installer/parameter.pm @@ -349,6 +349,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 "")) |