From 68a9a7f50d5cf6f7c3acac21ed805dcc0fdeb259 Mon Sep 17 00:00:00 2001
From: Karchnu <karchnu@karchnu.fr>
Date: Sat, 20 Feb 2021 10:05:04 +0100
Subject: [PATCH] Updated Makefile (new build.zsh 0.4.1)

---
 Makefile | 47 ++++++++++++++---------------------------------
 1 file changed, 14 insertions(+), 33 deletions(-)

diff --git a/Makefile b/Makefile
index 86f3cc6..85e6c21 100644
--- a/Makefile
+++ b/Makefile
@@ -10,21 +10,16 @@ MANDIR := $(SHAREDIR)/man
 LIBEXECDIR := $(PREFIX)/libexec
 SYSCONFDIR := $(PREFIX)/etc
 VERSION := 0.9.3
-
-CC := cc
-AR := ar
-RANLIB := ranlib
-CFLAGS := 
-LDFLAGS := 
+CRFLAGS := --release
 
 Q := @
 
 all: packaging assemble-apk.sh src/config.cr
 	@:
 
-packaging: src/main.cr src/backends.cr src/context.cr src/exception.cr src/instructions.cr src/main.cr src/package.cr src/recipe.cr src/sources.cr src/config.cr 
+packaging: src/main.cr src/backends.cr src/context.cr src/exception.cr src/instructions.cr src/main.cr src/package.cr src/recipe.cr src/sources.cr src/config.cr  
 	@echo '  CR >    packaging'
-	$(Q)crystal src/main.cr -o 'packaging'
+	$(Q)crystal build  $(CRFLAGS) src/main.cr -o 'packaging'
 
 
 packaging.install: packaging
@@ -54,8 +49,8 @@ assemble-apk.sh.uninstall:
 	$(Q)rm -f '$(DESTDIR)$(LIBEXECDIR)/packaging/assemble-apk.sh'
 
 src/config.cr: src/config.cr.in src
-	@echo '  SED >   src/config.cr'
-	$(Q)sed -e 's&@PREFIX@&$(PREFIX)&;s&@BINDIR@&$(BINDIR)&;s&@LIBDIR@&$(LIBDIR)&;s&@SHAREDIR@&$(SHAREDIR)&;s&@INCLUDEDIR@&$(INCLUDEDIR)&;s&@MANDIR@&$(MANDIR)&;s&@LIBEXECDIR@&$(LIBEXECDIR)&;s&@SYSCONFDIR@&$(SYSCONFDIR)&;s&@VERSION@&$(VERSION)&;' src/config.cr.in > 'src/config.cr'
+	@echo '  SED >   src/config.cr'
+	$(Q)sed -e 's&@PREFIX@&$(PREFIX)&;s&@BINDIR@&$(BINDIR)&;s&@LIBDIR@&$(LIBDIR)&;s&@SHAREDIR@&$(SHAREDIR)&;s&@INCLUDEDIR@&$(INCLUDEDIR)&;s&@MANDIR@&$(MANDIR)&;s&@LIBEXECDIR@&$(LIBEXECDIR)&;s&@SYSCONFDIR@&$(SYSCONFDIR)&;s&@VERSION@&$(VERSION)&;s&@CRFLAGS@&$(CRFLAGS)&;' src/config.cr.in > 'src/config.cr'
 	$(Q)chmod +x 'src/config.cr'
 
 
@@ -90,25 +85,14 @@ $(DESTDIR)$(INCLUDEDIR):
 $(DESTDIR)$(MANDIR):
 	@echo '  DIR >   $(MANDIR)'
 	$(Q)mkdir -p $(DESTDIR)$(MANDIR)
-install: subdirs.install packaging.install assemble-apk.sh.install src/config.cr.install
+install: packaging.install assemble-apk.sh.install src/config.cr.install
 	@:
 
-subdirs.install:
-
-uninstall: subdirs.uninstall packaging.uninstall assemble-apk.sh.uninstall src/config.cr.uninstall
+uninstall: packaging.uninstall assemble-apk.sh.uninstall src/config.cr.uninstall
 	@:
 
-subdirs.uninstall:
-
-test: all subdirs subdirs.test
-	@:
-
-subdirs.test:
-
 clean: packaging.clean assemble-apk.sh.clean src/config.cr.clean
-
 distclean: clean
-
 dist: dist-gz dist-xz dist-bz2
 	$(Q)rm -- $(PACKAGE)-$(VERSION)
 
@@ -173,23 +157,20 @@ help:
 	@echo '    - uninstall      Deinstalls the project.'
 	@echo ''
 	@echo 'CLI-modifiable variables:'
-	@echo '    - CC             ${CC}'
-	@echo '    - CFLAGS         ${CFLAGS}'
-	@echo '    - LDFLAGS        ${LDFLAGS}'
-	@echo '    - DESTDIR        ${DESTDIR}'
+	@echo '    - LIBEXECDIR     ${LIBEXECDIR}'
+	@echo '    - SYSCONFDIR     ${SYSCONFDIR}'
+	@echo '    - VERSION        ${VERSION}'
+	@echo '    - CRFLAGS        ${CRFLAGS}'
 	@echo '    - PREFIX         ${PREFIX}'
 	@echo '    - BINDIR         ${BINDIR}'
 	@echo '    - LIBDIR         ${LIBDIR}'
 	@echo '    - SHAREDIR       ${SHAREDIR}'
 	@echo '    - INCLUDEDIR     ${INCLUDEDIR}'
 	@echo '    - MANDIR         ${MANDIR}'
-	@echo '    - LIBEXECDIR     ${LIBEXECDIR}'
-	@echo '    - SYSCONFDIR     ${SYSCONFDIR}'
-	@echo '    - VERSION        ${VERSION}'
 	@echo ''
 	@echo 'Project targets: '
-	@echo '    - packaging      crystal'
-	@echo '    - assemble-apk.sh script'
+	@echo '    - packaging              crystal'
+	@echo '    - assemble-apk.sh        script'
 	@echo ''
 	@echo 'Makefile options:'
 	@echo '    - gnu:           false'
@@ -197,5 +178,5 @@ help:
 	@echo ''
 	@echo 'Rebuild the Makefile with:'
 	@echo '    zsh ./build.zsh -c'
-.PHONY: all subdirs clean distclean dist install uninstall help
+.PHONY: all  clean distclean dist install uninstall help