merged with upstream

1 files changed, 23 insertions, 34 deletions

diff --git a/Makefile b/Makefile
index d9bd337..8d48e2f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,47 +1,36 @@
-V=$(shell git describe --exact-match)
-
-INSTALL_FILES=$(wildcard archiso/initcpio/install/*)
-HOOKS_FILES=$(wildcard archiso/initcpio/hooks/*)
-SCRIPT_FILES=$(wildcard archiso/initcpio/script/*)
-
-INSTALL_DIR=$(DESTDIR)/usr/lib/initcpio/install
-HOOKS_DIR=$(DESTDIR)/usr/lib/initcpio/hooks
-SCRIPT_DIR=$(DESTDIR)/usr/lib/initcpio
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
-DOC_FILES=$(wildcard docs/*)
-
-DOC_DIR=$(DESTDIR)/usr/share/doc/archiso
+PREFIX ?= /usr/local
+BIN_DIR=$(DESTDIR)$(PREFIX)/bin
+DOC_DIR=$(DESTDIR)$(PREFIX)/share/doc/archiso
+PROFILE_DIR=$(DESTDIR)$(PREFIX)/share/archiso
 
+DOC_FILES=$(wildcard docs/*) $(wildcard *.rst)
+SCRIPT_FILES=$(wildcard archiso/*) $(wildcard scripts/*.sh) $(wildcard .gitlab/ci/*.sh) \
+             $(wildcard configs/*/profiledef.sh) $(wildcard configs/*/airootfs/usr/local/bin/*)
 
 all:
 
-check:
-	shellcheck -s bash archiso/mkarchiso \
-	                   scripts/run_archiso.sh \
-	                   $(INSTALL_FILES) \
-	                   $(wildcard configs/*/build.sh) \
-	                   configs/releng/airootfs/root/.automated_script.sh \
-	                   configs/releng/airootfs/usr/local/bin/choose-mirror
-	shellcheck -s dash $(HOOKS_FILES) $(SCRIPT_FILES)
+check: shellcheck
 
-install: install-program install-initcpio install-examples install-doc
+shellcheck:
+	shellcheck -s bash $(SCRIPT_FILES)
 
-install-program:
-	install -D -m 755 archiso/mkarchiso $(DESTDIR)/usr/bin/mkarchiso
+install: install-scripts install-profiles install-doc
 
-install-initcpio:
-	install -d $(SCRIPT_DIR) $(HOOKS_DIR) $(INSTALL_DIR)
-	install -m 755 -t $(SCRIPT_DIR) $(SCRIPT_FILES)
-	install -m 644 -t $(HOOKS_DIR) $(HOOKS_FILES)
-	install -m 644 -t $(INSTALL_DIR) $(INSTALL_FILES)
+install-scripts:
+	install -vDm 755 archiso/mkarchiso -t "$(BIN_DIR)/"
+	install -vDm 755 scripts/run_archiso.sh "$(BIN_DIR)/run_archiso"
 
-install-examples:
-	install -d -m 755 $(DESTDIR)/usr/share/archiso/
-	cp -a --no-preserve=ownership configs $(DESTDIR)/usr/share/archiso/
+install-profiles:
+	install -d -m 755 $(PROFILE_DIR)
+	cp -a --no-preserve=ownership configs $(PROFILE_DIR)/
 
 install-doc:
-	install -d $(DOC_DIR)
-	install -m 644 -t $(DOC_DIR) $(DOC_FILES)
+	install -vDm 644 $(DOC_FILES) -t $(DOC_DIR)
+
+V=$(shell git describe --exact-match)
 
 dist:
 	git archive --format=tar --prefix=archiso32-$(V)/ $(V) | gzip -9 > archiso32-$(V).tar.gz
@@ -50,4 +39,4 @@ dist:
 upload:
 	scp archiso32-$(V).tar.gz archiso32-$(V).tar.gz.sig sources.archlinux32.org:sources/
 
-.PHONY: check install install-program install-initcpio install-examples install-doc dist upload
+.PHONY: check install install-doc install-profiles install-scripts shellcheck dist upload