summaryrefslogtreecommitdiffstats
path: root/make/include/contrib.defs
diff options
context:
space:
mode:
authorkonablend <[email protected]>2009-03-05 08:58:30 +0000
committerkonablend <[email protected]>2009-03-05 08:58:30 +0000
commit315201db9b43310589d59270d16304240f6d886e (patch)
tree1855dfe16ba28a3d08d34f22cb6795d624584c90 /make/include/contrib.defs
parentd9cbd469c2cda62f205599173910ec627031dadd (diff)
BuildSystem:
- fixed race condition where bzip2,xvidcore may fail on missing contrib/{lib,include} dirs. - replaced literal command uses with var in bzip2,xvidcore . git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2224 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'make/include/contrib.defs')
-rw-r--r--make/include/contrib.defs4
1 files changed, 3 insertions, 1 deletions
diff --git a/make/include/contrib.defs b/make/include/contrib.defs
index 5f0b2d224..4c344767d 100644
--- a/make/include/contrib.defs
+++ b/make/include/contrib.defs
@@ -126,6 +126,7 @@ define import.CONTRIB.defs
$(1).INSTALL.args = !make @dir !extra !ntargets
$(1).INSTALL.args.dir = -C $$(1) install
+ $(1).INSTALL.mkdirs = $$(CONTRIB.build/)lib/ $$(CONTRIB.build/)include/
$(1).INSTALL.target = $$($(1).build/).stamp.install
define $(1).INSTALL
$$(call fn.ARGS,$(1).INSTALL,$$($(1).INSTALL.args))
@@ -173,6 +174,7 @@ define import.CONTRIB.defs
$(1).out += $$($(1).PATCH.target)
$(1).out += $$($(1).CONFIGURE.target)
$(1).out += $$($(1).BUILD.target)
+ $(1).out += $$($(1).INSTALL.mkdirs)
$(1).out += $$($(1).INSTALL.target)
BUILD.out += $$($(1).out)
@@ -261,7 +263,7 @@ $($(1).name).build.untouch:
##
$($(1).name).install: $$($(1).INSTALL.target)
-$$($(1).INSTALL.target): | $$(dir $$($(1).INSTALL.target))
+$$($(1).INSTALL.target): | $$(dir $$($(1).INSTALL.target)) $$($(1).INSTALL.mkdirs)
$$($(1).INSTALL.target): $$($(1).BUILD.target)
$$($(1).INSTALL)