From 8088cb29028e3117955f73a5835fccf78ab934dc Mon Sep 17 00:00:00 2001
From: Paras Mamgain <mamgainp@in.ibm.com>
Date: Tue, 11 Jun 2019 13:59:22 +0100
Subject: [PATCH 1/4] fixes DOWNLOAD_DIR variable for windows

---
 Makefile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Makefile b/Makefile
index 15d158d..25d5501 100644
--- a/Makefile
+++ b/Makefile
@@ -85,6 +85,11 @@ else
 	DOWNLOADS_DIR=$(realpath ./downloads/)
 endif
 
+#Try to pick up the downloads directory if rnning in windows
+ifneq (,$(findstring Windows,$(shell echo ${OS})))
+	DOWNLOADS_DIR=$(shell pwd)/downloads/
+endif
+
 # Try to figure out which archive to use from the architecture
 ifeq "$(ARCH)" "amd64"
 	MQ_ARCHIVE_ARCH=X86-64

From 426c6c3b9adee6807f1e928b6d3938fa6d4e33c5 Mon Sep 17 00:00:00 2001
From: Paras Mamgain <mamgainp@in.ibm.com>
Date: Tue, 11 Jun 2019 13:59:38 +0100
Subject: [PATCH 2/4] fixes DOWNLOAD_DIR variable for windows

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 25d5501..59ed6d4 100644
--- a/Makefile
+++ b/Makefile
@@ -85,7 +85,7 @@ else
 	DOWNLOADS_DIR=$(realpath ./downloads/)
 endif
 
-#Try to pick up the downloads directory if rnning in windows
+#Try to pick up the downloads directory if running in windows
 ifneq (,$(findstring Windows,$(shell echo ${OS})))
 	DOWNLOADS_DIR=$(shell pwd)/downloads/
 endif

From 6691438fa12022db830c87143646e77dcbb07cec Mon Sep 17 00:00:00 2001
From: Paras Mamgain <mamgainp@in.ibm.com>
Date: Tue, 11 Jun 2019 15:13:10 +0100
Subject: [PATCH 3/4] fixes DOWNLOAD_DIR variable for windows

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 59ed6d4..e3f0536 100644
--- a/Makefile
+++ b/Makefile
@@ -81,13 +81,13 @@ endif
 
 ifneq (,$(findstring Microsoft,$(shell uname -r)))
 	DOWNLOADS_DIR=$(patsubst /mnt/c%,C:%,$(realpath ./downloads/))
+else 
+ifneq (,$(findstring Windows,$(shell echo ${OS})))
+	DOWNLOADS_DIR=$(shell pwd)/downloads/
 else
 	DOWNLOADS_DIR=$(realpath ./downloads/)
 endif
 
-#Try to pick up the downloads directory if running in windows
-ifneq (,$(findstring Windows,$(shell echo ${OS})))
-	DOWNLOADS_DIR=$(shell pwd)/downloads/
 endif
 
 # Try to figure out which archive to use from the architecture

From 9714d0d5131e360709d9df3df6264586bc78e116 Mon Sep 17 00:00:00 2001
From: mamgainp <mamgainp@in.ibm.com>
Date: Wed, 12 Jun 2019 15:39:41 +0100
Subject: [PATCH 4/4] fixes ifelse ladder

---
 Makefile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index e3f0536..d5870ee 100644
--- a/Makefile
+++ b/Makefile
@@ -81,15 +81,12 @@ endif
 
 ifneq (,$(findstring Microsoft,$(shell uname -r)))
 	DOWNLOADS_DIR=$(patsubst /mnt/c%,C:%,$(realpath ./downloads/))
-else 
-ifneq (,$(findstring Windows,$(shell echo ${OS})))
+else ifneq (,$(findstring Windows,$(shell echo ${OS})))
 	DOWNLOADS_DIR=$(shell pwd)/downloads/
 else
 	DOWNLOADS_DIR=$(realpath ./downloads/)
 endif
 
-endif
-
 # Try to figure out which archive to use from the architecture
 ifeq "$(ARCH)" "amd64"
 	MQ_ARCHIVE_ARCH=X86-64