Allow for .tgz extensions in DISTFILES

common.mk

@@ -4,10 +4,11 @@ DCDBDEPLOYPATH ?= $(DCDBBASEPATH)/install
 
 FETCH = wget -c --no-check-certificate -O 
 MD5 = $(if $(shell which md5 2>/dev/null),md5,$(if $(shell md5sum --tag Makefile 2&> /dev/null || true),md5sum --tag,openssl md5))
+OS = $(shell uname -s)
 MAKETHREADS ?= $(if $(findstring $(shell uname),Darwin),$(shell sysctl machdep.cpu.thread_count | cut -b 27-),\
                $(if $(findstring $(shell uname),Linux),$(shell cat /proc/cpuinfo | grep processor | wc -l),4))
 DISTFILESNAMES = $(foreach f,$(DISTFILES),$(shell echo "$(f)" | sed 's/;.*//'))
-DISTFILESPATHS = $(foreach f,$(DISTFILES),$(shell echo "$(f)" | sed 's/.tar.gz;.*//' | sed 's/.zip;.*//' ))
+DISTFILESPATHS = $(foreach f,$(DISTFILES),$(shell echo "$(f)" | sed 's/.tar.gz;.*//; s/.tgz;.*//; s/.zip;.*//' ))
 
 # If cross-compiling for ARM, adjust the build settings
 ifeq ("$(ARCH)", "arm")
@@ -75,10 +76,10 @@ $(DCDBDEPSPATH)/%/.extracted: | $(DCDBDEPSPATH)/distfiles/$$(call getarchive,%)
 			exit 2; \
 		fi; \
 		echo Extracting: $(F); \
-		if [ "$(suffix $(F))" = ".gz" ]; then \
-			cd $(DCDBDEPSPATH) && tar xzf distfiles/$(F); \
+		if [ "$(suffix $(F))" = "zip" ]; then \
+			cd $(DCDBDEPSPATH) && unzip distfiles/$(F); \
 		else \
-			cd $(DCDBDEPSPATH) && unzip distfiles/$(F) > /dev/null; \
+			cd $(DCDBDEPSPATH) && tar xf distfiles/$(F) > /dev/null; \
 		fi; \
 	fi 
 	@touch $@