summaryrefslogtreecommitdiff
path: root/solenv/gbuild/InstallScript.mk
diff options
context:
space:
mode:
Diffstat (limited to 'solenv/gbuild/InstallScript.mk')
-rw-r--r--solenv/gbuild/InstallScript.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/solenv/gbuild/InstallScript.mk b/solenv/gbuild/InstallScript.mk
index 35ea142ca147..c325d4bfa2be 100644
--- a/solenv/gbuild/InstallScript.mk
+++ b/solenv/gbuild/InstallScript.mk
@@ -36,6 +36,10 @@ define gb_InstallScriptTarget__get_files
$(notdir $(shell cat $(foreach module,$(1),$(call gb_InstallModule_get_filelist,$(module)))))
endef
+define gb_InstallScriptTarget__get_dirs
+$(sort $(dir $(shell cat $(foreach module,$(1),$(call gb_InstallModule_get_filelist,$(module))))))
+endef
+
# Pass first arg if make is running in silent mode, second arg otherwise
define gb_InstallScriptTarget__if_silent
$(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),$(1),$(2))
@@ -50,7 +54,7 @@ $(call gb_Helper_abbreviate_dirs,\
) && \
$(gb_InstallScriptTarget_COMMAND) \
$(call gb_InstallScriptTarget__if_silent,-q) \
- -i $(OUTDIR)/par/osl \
+ -i $(call gb_InstallScriptTarget__get_dirs,$(SCP_MODULES)) \
-o $(1) \
@@$${RESPONSEFILE} && \
rm -f $${RESPONSEFILE} \