diff options
| author | David Tardon <dtardon@redhat.com> | 2012-06-16 07:19:41 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-06-18 10:55:31 +0200 |
| commit | 990586bd5bca08ffb868f5473050b31519ed5f9d (patch) | |
| tree | 8b66663d5747c5206745598b755ddab7ed8a033d /solenv/gbuild/InstallScript.mk | |
| parent | OSL_TRACE -> SAL_INFO (diff) | |
| download | core-990586bd5bca08ffb868f5473050b31519ed5f9d.tar.gz core-990586bd5bca08ffb868f5473050b31519ed5f9d.zip | |
change the way par files for ins are collected
This avoids the need for $(wildcard), which seemed to cause problems in
some cases (in gentoo ebuild) and I never found any missing dependency
that might account for it.
Change-Id: Ia03d630bb85309fbb7da3068c396834fb56cffb1
Diffstat (limited to 'solenv/gbuild/InstallScript.mk')
| -rw-r--r-- | solenv/gbuild/InstallScript.mk | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/solenv/gbuild/InstallScript.mk b/solenv/gbuild/InstallScript.mk index 506e7b31f805..35ea142ca147 100644 --- a/solenv/gbuild/InstallScript.mk +++ b/solenv/gbuild/InstallScript.mk @@ -32,6 +32,10 @@ gb_InstallScriptTarget_COMMAND := $(PERL) $(gb_InstallScriptTarget_TARGET) gb_InstallScriptTarget__make_arglist = $(subst $(WHITESPACE),$(COMMA),$(strip $(1))) +define gb_InstallScriptTarget__get_files +$(notdir $(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)) @@ -42,11 +46,11 @@ $(call gb_Output_announce,$(2),$(true),INS,4) $(call gb_Helper_abbreviate_dirs,\ RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\ $(call gb_InstallScriptTarget__make_arglist,\ - $(notdir $(foreach module,$(SCP_MODULE_DIRS),$(wildcard $(module)/*$(SCP_SUFFIX))))) \ + $(call gb_InstallScriptTarget__get_files,$(SCP_MODULES))) \ ) && \ $(gb_InstallScriptTarget_COMMAND) \ $(call gb_InstallScriptTarget__if_silent,-q) \ - -i $(call gb_InstallScriptTarget__make_arglist,$(SCP_MODULE_DIRS) $(OUTDIR)/par) \ + -i $(OUTDIR)/par/osl \ -o $(1) \ @@$${RESPONSEFILE} && \ rm -f $${RESPONSEFILE} \ @@ -70,15 +74,14 @@ $(call gb_InstallScriptTarget_get_clean_target,%) : # gb_InstallScriptTarget_InstallScriptTarget(<target>) define gb_InstallScriptTarget_InstallScriptTarget $(call gb_InstallScriptTarget_get_target,$(1)) :| $(dir $(call gb_InstallScriptTarget_get_target,$(1))).dir -$(call gb_InstallScriptTarget_get_target,$(1)) : SCP_MODULE_DIRS := -$(call gb_InstallScriptTarget_get_target,$(1)) : SCP_SUFFIX := $(suffix $(call gb_ScpTarget_get_target,%)) +$(call gb_InstallScriptTarget_get_target,$(1)) : SCP_MODULES := endef define gb_InstallScriptTarget_use_module -$(call gb_InstallScriptTarget_get_target,$(1)) : $(call gb_InstallModuleTarget_get_target,$(2)) -$(call gb_InstallScriptTarget_get_clean_target,$(1)) : $(call gb_InstallModuleTarget_get_clean_target,$(2)) -$(call gb_InstallScriptTarget_get_target,$(1)) : SCP_MODULE_DIRS += $(call gb_InstallModuleTarget_get_workdir,$(2)) +$(call gb_InstallScriptTarget_get_target,$(1)) : $(call gb_InstallModule_get_target,$(2)) +$(call gb_InstallScriptTarget_get_clean_target,$(1)) : $(call gb_InstallModule_get_clean_target,$(2)) +$(call gb_InstallScriptTarget_get_target,$(1)) : SCP_MODULES += $(2) endef |