Makefile cleanup

diff --git a/Makefile b/Makefile
index f57e947227ec391e27e4a581934879eb6d3c70ce..8ac97ad1e115b86124016329d11952739ba9110c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ AS ?= as
 LD ?= ld
 OC ?= objcopy
 
-name := Corbenik
+name ?= Corbenik
 
 # If unset, the primary folder is /corbenik.
 fw_folder ?= corbenik

diff --git a/contrib/Makefile b/contrib/Makefile
index c2f7f8605f0fd87f09557a113d76368b4da49aa8..c2489abbfab4899e41859e84cc0edd3d4720c1c9 100644 (file)
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -6,8 +6,8 @@ build: clean $(patsubst %.pco, %.vco, $(wildcard *.pco))
 
 .PHONY: install
 install: build
-       mkdir -p ../out/corbenik/contrib
-       cp *.vco README.md ../out/corbenik/contrib/
+       mkdir -p $(out)/contrib
+       cp *.vco README.md $(out)/contrib/
 
 %.vco: %.pco
        ../host/bytecode_asm.py $< $@

diff --git a/external/Makefile b/external/Makefile
index dd7035da47d09a80de670434f4989a5db250b7d5..e421fe3fa0dafe35fcd27edd8cf2c29da3a205db 100644 (file)
--- a/external/Makefile
+++ b/external/Makefile
@@ -16,8 +16,8 @@ endif
 
 .PHONY: clean
 clean: clean_loader clean_bits clean_screeninit
-       rm -rf ../out/corbenik/bits
-       rm -rf ../out/corbenik/module
+       rm -rf $(out)/bits
+       rm -rf $(out)/module
 
 .PHONY: loader
 loader:

diff --git a/patch/Makefile b/patch/Makefile
index 73c8f53ae1af51da0c616fe0ee0f825e4ed97ccc..7873eaa59738579828ea3c089747bd877676272e 100644 (file)
--- a/patch/Makefile
+++ b/patch/Makefile
@@ -6,8 +6,8 @@ build: clean $(patsubst %.pco, %.vco, $(wildcard *.pco))
 
 .PHONY: install
 install: build
-       mkdir -p ../out/corbenik/patch
-       cp *.vco ../out/corbenik/patch/
+       mkdir -p $(out)/patch
+       cp *.vco $(out)/patch/
 
 %.vco: %.pco
        ../host/bytecode_asm.py $< $@