From 16050f56f742854b97056521231aaaa0d8d20e39 Mon Sep 17 00:00:00 2001
From: Braiden Vasco <braiden-vasco@users.noreply.github.com>
Date: Wed, 8 Nov 2017 11:11:31 +0000
Subject: [PATCH] Fix Makefile fully

---
 Makefile                      | 4 ++++
 README.md                     | 4 ++--
 configure                     | 2 +-
 env/{test-host.mk => none.mk} | 0
 env/{build-x86.mk => x86.mk}  | 0
 5 files changed, 7 insertions(+), 3 deletions(-)
 rename env/{test-host.mk => none.mk} (100%)
 rename env/{build-x86.mk => x86.mk} (100%)

diff --git a/Makefile b/Makefile
index 63c2596..f664e8e 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,11 @@ export LIBARCH = $(shell pwd)/arch/$(ARCH)/libarch.a
 export LINKER  = $(shell pwd)/arch/$(ARCH)/linker.ld
 export MODULES = $(addprefix $(shell pwd)/modules/, dummy1.bin dummy2.bin)
 
+ifeq (none, $(ARCH))
+run: test
+else
 run: run-iso
+endif
 
 all: all-kernel
 
diff --git a/README.md b/README.md
index fab31a0..cfe9aaa 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ Build and run
 -------------
 
 ```sh
-./configure build-x86
+./configure x86
 make clean
 make run
 ```
@@ -39,7 +39,7 @@ Run tests
 ---------
 
 ```sh
-./configure test-host
+./configure none
 make clean
 make test
 ```
diff --git a/configure b/configure
index 21b5d41..1c46d0f 100755
--- a/configure
+++ b/configure
@@ -3,7 +3,7 @@
 ENV="$1"
 
 if [ -z "$ENV" ]; then
-    ENV='build-x86'
+    ENV='x86'
 fi
 
 CONFIG="env/$ENV.mk"
diff --git a/env/test-host.mk b/env/none.mk
similarity index 100%
rename from env/test-host.mk
rename to env/none.mk
diff --git a/env/build-x86.mk b/env/x86.mk
similarity index 100%
rename from env/build-x86.mk
rename to env/x86.mk