X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=catchallcommand.cpp;fp=catchallcommand.cpp;h=bf866cbedca07b7ee8b732eec683c64520ee2017;hb=43ed0accfbc2852849e104ff7eccdd2c42acd4ec;hp=857f68431c54b8a0076577ae74b70ecfba6e9773;hpb=5d77fd07180d1fb8561ff1962e6d7429caf8555e;p=mothur.git

diff --git a/catchallcommand.cpp b/catchallcommand.cpp
index 857f684..bf866cb 100644
--- a/catchallcommand.cpp
+++ b/catchallcommand.cpp
@@ -176,7 +176,7 @@ int CatchAllCommand::execute() {
 		
 		savedOutputDir = outputDir;
 		string catchAllCommandExe = ""; 
-		#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+		#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 			catchAllCommandExe += "mono " + path + "CatchAllcmdL.exe ";
 			if (outputDir == "") { outputDir = "./"; } //force full pathname to be created for catchall, this is necessary because if catchall is in the path it will look for input file whereever the exe is and not the cwd.
 		#else
@@ -224,7 +224,7 @@ int CatchAllCommand::execute() {
 											
 						//create system command
 						string catchAllCommand = "";
-						#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+						#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 							catchAllCommand += catchAllCommandExe + filename + " " + outputPath + " 1";
 						#else
 							if (outputPath.length() > 0) { outputPath = outputPath.substr(0, outputPath.length()-1); }
@@ -269,7 +269,7 @@ int CatchAllCommand::execute() {
 											
 						//create system command
 						string catchAllCommand = "";
-						#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+						#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 							catchAllCommand += catchAllCommandExe + filename + " " + outputPath + " 1";
 						#else
 							if (outputPath.length() > 0) { outputPath = outputPath.substr(0, outputPath.length()-1); }
@@ -334,7 +334,7 @@ int CatchAllCommand::execute() {
 				
 				//create system command
 				string catchAllCommand = "";
-				#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+				#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 					catchAllCommand += catchAllCommandExe + filename + " " + outputPath + " 1";
 				#else
 					if (outputPath.length() > 0) { outputPath = outputPath.substr(0, outputPath.length()-1); }