diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-26 12:14:48 +0200 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-26 12:19:03 +0200 |
commit | 300621ff72be787c5413edf46139b8c45ba0ff45 (patch) | |
tree | 60ffc89565e469fd8ec02bf5948590e5e8072478 /solenv/gbuild/CliAssembly.mk | |
parent | n#780843 testcase (diff) | |
download | core-300621ff72be787c5413edf46139b8c45ba0ff45.tar.gz core-300621ff72be787c5413edf46139b8c45ba0ff45.zip |
Revert "gbuild: use one pattern rule for creating directories"
It does not work with make 3.82 which prefers pattern rules
with longest match, so wrong rules are chosen in workdir.
This reverts commit bc234b4e1103cf8f79a7526ad80dcd9d0b78b89b.
Diffstat (limited to 'solenv/gbuild/CliAssembly.mk')
-rw-r--r-- | solenv/gbuild/CliAssembly.mk | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk index f78fae5097ed..e3a87bdf52ae 100644 --- a/solenv/gbuild/CliAssembly.mk +++ b/solenv/gbuild/CliAssembly.mk @@ -21,6 +21,9 @@ $(call gb_Helper_abbreviate_dirs,\ ) endef +$(dir $(call gb_CliConfigTarget_get_target,%))%/.dir : + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) + $(call gb_CliConfigTarget_get_target,%) : $(call gb_CliConfigTarget__command,$@,$*,$<) @@ -61,6 +64,12 @@ $(call gb_Helper_abbreviate_dirs,\ ) endef +$(dir $(call gb_CliAssemblyTarget_get_target,%)).dir : + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) + +$(dir $(call gb_CliAssemblyTarget_get_target,%))%/.dir : + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) + $(call gb_CliAssemblyTarget_get_target,%) : $(if $(strip $(CLI_ASSEMBLY_VERSION)),,$(call gb_Output_error,assembly version not set)) $(if $(strip $(CLI_ASSEMBLY_CONFIGFILE)),,$(call gb_Output_error,assembly configuration file not set)) |