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://localhost/HandBrake/trunk@2224 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/contrib/bzip2/module.defs b/contrib/bzip2/module.defs
index 83107cf..bda2a13 100644 (file)
--- a/contrib/bzip2/module.defs
+++ b/contrib/bzip2/module.defs
@@ -13,14 +13,13 @@ BZIP2.BUILD.extra = \
 BZIP2.BUILD.ntargets = libbz2.a
 
 define BZIP2.INSTALL
-    mkdir -p $(CONTRIB.build/)lib/ $(CONTRIB.build/)include/
-    cp $(BZIP2.EXTRACT.dir/)libbz2.a $(CONTRIB.build/)lib/
-    cp $(BZIP2.EXTRACT.dir/)bzlib.h $(CONTRIB.build/)include/
+    $(CP.exe) $(BZIP2.EXTRACT.dir/)libbz2.a $(CONTRIB.build/)lib/
+    $(CP.exe) $(BZIP2.EXTRACT.dir/)bzlib.h $(CONTRIB.build/)include/
     $(TOUCH.exe) $@
 endef
 
 define BZIP2.UNINSTALL
-    rm $(CONTRIB.build/)lib/libbz2.a
-    rm $(CONTRIB.build/)include/bzlib.h
+    $(RM.exe) $(CONTRIB.build/)lib/libbz2.a
+    $(RM.exe) $(CONTRIB.build/)include/bzlib.h
     $(RM.exe) -f $(BZIP2.INSTALL.target)
 endef

diff --git a/contrib/xvidcore/module.defs b/contrib/xvidcore/module.defs
index c45059b..f25d89d 100644 (file)
--- a/contrib/xvidcore/module.defs
+++ b/contrib/xvidcore/module.defs
@@ -10,13 +10,13 @@ XVIDCORE.BUILD.dir      = $(XVIDCORE.EXTRACT.dir/)build/generic/
 XVIDCORE.BUILD.ntargets = libxvidcore.a
 
 define XVIDCORE.INSTALL
-    cp $(XVIDCORE.EXTRACT.dir/)build/generic/=build/libxvidcore.a $(CONTRIB.build/)lib/
-    cp $(XVIDCORE.EXTRACT.dir/)src/xvid.h $(CONTRIB.build/)include/
+    $(CP.exe) $(XVIDCORE.EXTRACT.dir/)build/generic/=build/libxvidcore.a $(CONTRIB.build/)lib/
+    $(CP.exe) $(XVIDCORE.EXTRACT.dir/)src/xvid.h $(CONTRIB.build/)include/
     $(TOUCH.exe) $@
 endef
 
 define XVIDCORE.UNINSTALL
-    rm $(CONTRIB.build/)lib/libxvidcore.a
-    rm $(CONTRIB.build/)include/xvid.h
+    $(RM.exe) $(CONTRIB.build/)lib/libxvidcore.a
+    $(RM.exe) $(CONTRIB.build/)include/xvid.h
     $(RM.exe) -f $(XVIDCORE.INSTALL.target)
 endef

diff --git a/make/include/contrib.defs b/make/include/contrib.defs
index 5f0b2d2..4c34476 100644 (file)
--- 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)