OSDN Git Service

BuildSystem: fixed EXTRACT.tarbase default to support .tar.bz2 and .tar.gz extensions.
authorkonablend <konablend@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Tue, 19 May 2009 02:26:29 +0000 (02:26 +0000)
committerkonablend <konablend@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Tue, 19 May 2009 02:26:29 +0000 (02:26 +0000)
git-svn-id: svn://localhost/HandBrake/trunk@2425 b64f7644-9d1e-0410-96f1-a4d463321fa5

make/include/contrib.defs

index a3019ad..72ecde6 100644 (file)
@@ -34,7 +34,7 @@ define import.CONTRIB.defs
     ##
     ## target: extract
     ##
-    $(1).EXTRACT.tarbase = $$(patsubst %.tar.gz,%,$$(notdir $$($(1).FETCH.url)))
+    $(1).EXTRACT.tarbase = $$(foreach x,tar.bz2 tar.gz,$$(patsubst %.$$(x),%,$$(filter %.$$(x),$$(notdir $$($(1).FETCH.url)))))
     $(1).EXTRACT.dir/    = $$($(1).build/)$$($(1).EXTRACT.tarbase)/
     $(1).EXTRACT.target  = $$($(1).build/).stamp.extract
     define $(1).EXTRACT