dvdnav: fix crash when poorly masterd disc has no menus

[handbrake-jp/handbrake-jp-git.git] / contrib / bzip2 / module.defs

diff --git a/contrib/bzip2/module.defs b/contrib/bzip2/module.defs
index 83107cf..8cb6d7e 100644 (file)
--- a/contrib/bzip2/module.defs
+++ b/contrib/bzip2/module.defs
@@ -3,24 +3,24 @@ $(eval $(call import.CONTRIB.defs,BZIP2))
 
 BZIP2.FETCH.url = http://download.m0k.org/handbrake/contrib/bzip2-1.0.5.tar.gz
 BZIP2.EXTRACT.tarbase = bzip2
-BZIP2.CONFIGURE =
+BZIP2.CONFIGURE = $(TOUCH.exe) $@
 
 BZIP2.BUILD.extra = \
     CC=$(BZIP2.GCC.gcc) \
-    CFLAGS="$(call fn.ARGS,BZIP2.GCC,*archs)" \
+    CFLAGS="$(call fn.ARGS,BZIP2.GCC,*archs *sysroot *minver)" \
+    RANLIB="$(RANLIB.exe)"
     PREFIX=$(call fn.ABSOLUTE,$(CONTRIB.build/))
 
 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) -f $(CONTRIB.build/)lib/libbz2.a
+    $(RM.exe) -f $(CONTRIB.build/)include/bzlib.h
     $(RM.exe) -f $(BZIP2.INSTALL.target)
 endef