version

ncbi · Jun 17, 2020 · d95a65e · d95a65e
1 parent 817c5d1
commit d95a65e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/MakeRules b/MakeRules
@@ -28,7 +28,12 @@ DebugCPPFLAGS = $(SimpleCPPFLAGS) -O3 -g
 CXX=g++
 COMPILE.cpp= $(CXX) $(CPPFLAGS)  -c 
 LIBS=-pthread 
-ECHO = echo ""; echo ""
+
+ifdef AT_NCBI
+  ECHO = echo ""; echo ""
+else
+  ECHO = echo ""
+endif
 
 
 CODE_DIR = $(HOME)/code

diff --git a/bash_common.sh b/bash_common.sh
@@ -20,3 +20,11 @@ function error
 	echo -e "${RED}$MSG${NOCOLOR}"
 	exit 1
 }
+
+
+function success
+{
+  echo ""
+  echo -e "${GREEN}SUCCESS!${NOCOLOR}"
+  exit 0
+}
diff --git a/make.sh b/make.sh
@@ -42,7 +42,7 @@ fi
 
 echo ""
 echo "Software version:"
-./makeDistTree -version
+phylogeny/makeDistTree -version
 
-echo ""
-echo -e ${GREEN}SUCCESS!${NOCOLOR}
+
+success
diff --git a/version.inc b/version.inc
@@ -1 +1 @@
-#define VERSION "1.1.5"
+#define VERSION "1.1.6"