change makefile

Makefile

@@ -31,35 +31,46 @@ orthofuser:
 	git clone https://github.com/macmanes-lab/OrthoFinder.git && export PATH=${DIR}/software/OrthoFinder/orthofinder:$$PATH
 
 blast:
-	ifneq ($$(basename $$(shell which blast)), blastp) && \
-		$("blastp is not installed, installing now...") && \
-		cd ${DIR}/software && \
-		curl -LO ftp://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/LATEST/ncbi-blast-2.6.0+-x64-linux.tar.gz && tar -zxf ncbi-blast-2.6.0+-x64-linux.tar.gz && \
-		export PATH=${DIR}/software/ncbi-blast-2.6.0+/bin:$$PATH  && \
-	else
-		echo "BLASTP is already installed"
-	endif
+ifeq "$(shell basename $(shell which blastp))" "blastp"
+        @echo "BLASTP is already installed"
+else
+        @echo "blastp is not installed, installing now..."
+        cd ${DIR}/software &$ curl -LO ftp://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/LATEST/ncbi-blast-2.6.0+-x64-linux.tar.gz && tar -zxf ncbi-blast-2.6.0+-x64-linux.tar.gz
+        export PATH=${DIR}/software/ncbi-blast-2.6.0+/bin:$$PATH
+endif
 
 spades:
-	ifndef spades.py && \
+ifeq "$(shell basename $(shell which spades.py))" "spades.py"
+    @echo "SPAdes is already installed"
+else
 	cd ${DIR}/software && \
 	curl -LO http://cab.spbu.ru/files/release3.10.1/SPAdes-3.10.1-Linux.tar.gz && tar -zxf SPAdes-3.10.1-Linux.tar.gz && \
 	export PATH=${DIR}/software/SPAdes-3.10.1-Linux/bin:$$PATH
+endif
 
 trinity:
-	ifndef Trinity && \
+ifeq "$(shell basename $(shell which Trinity))" "Trinity"
+    @echo "Trinity is already installed"
+else
 	cd ${DIR}/software && \
 	git clone https://github.com/trinityrnaseq/trinityrnaseq.git && cd trinityrnaseq && make
 	export PATH=$$PATH:${DIR}/software/trinityrnaseq
+endif
 
 shannon:
-	ifndef shannon.py && \
+ifeq "$(shell basename $(shell which shannon.py))" "shannon.py"
+    @echo "Shannon is already installed"
+else
 	cd ${DIR}/software && \
 	git clone https://github.com/sreeramkannan/Shannon.git
 	export PATH=$$PATH:${DIR}/software/Shannon
+endif
 
 seqtk:
-	ifndef seqtk && \
+ifeq "$(shell basename $(shell which seqtk))" "seqtk"
+    @echo "seqtk is already installed"
+else
 	cd ${DIR}/software && \
 	git clone https://github.com/lh3/seqtk.git && cd seqtk && make
 	export PATH=$$PATH:${DIR}/software/seqtk
+endif