From 6f2977a72d8f5642d3b4eeb97159e9b9d8a40bb4 Mon Sep 17 00:00:00 2001
From: Blaise Li <blaise.li__git@nsup.org>
Date: Thu, 3 Dec 2020 16:30:10 +0100
Subject: [PATCH] Cleaner Makefile.

Doesn't use modules, distinguishes between install using nimble and
install under PREFIX.
---
 Nim/Makefile | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/Nim/Makefile b/Nim/Makefile
index 58c2532..ff8724b 100644
--- a/Nim/Makefile
+++ b/Nim/Makefile
@@ -1,15 +1,18 @@
 PREFIX ?= $(HOME)
 prog = qaf_demux
 
-bin/$(prog): src/$(prog).nim
-	(module --version 2> /dev/null \
-	    && (nimble --version 2> /dev/null \
-	        || (echo "loading nimble" && module load gcc/10.1.0 nim/1.4.2 pcre/8.43 && nimble install -y))) \
-	    || nimble install -y
+bin/$(prog): src/qaf_demux.nim src/qaf_demux.nim.cfg qaf_demux.nimble
+	nimble build
 
 build: bin/$(prog)
 
+# Install "the nimble way" (in user's ~/.nimble directory)
+nimble_install: src/qaf_demux.nim src/qaf_demux.nim.cfg qaf_demux.nimble
+	nimble install -y
+
+# Install under PREFIX
 install: build
-	install -D -T bin/$(prog) $(PREFIX)/bin/$(prog)
+	install -m 0775 -D -T bin/$(prog) $(PREFIX)/bin/$(prog)
 
-all: build install
+clean:
+	rm -f bin/$(prog)
-- 
GitLab