makefile: small fix

Makefile

@@ -1,7 +1,23 @@
-Version=0.1
+VERSION = 0.5
+
+PKG = live-services
+TOOLS = artools
 
-PREFIX = /usr/local
 SYSCONFDIR = /etc
+ifdef PREFIX
+PREFIX = /usr/local
+endif
+BINDIR = $(PREFIX)/bin
+LIBDIR = $(PREFIX)/lib
+DATADIR = $(PREFIX)/share
+
+FMODE = -m0644
+DMODE = -dm0755
+BMODE = -m0755
+RM = rm -f
+M4 = m4 -P
+CHAW = chmod a-w
+CHX = chmod +x
 
 BIN = \
 	bin/artix-live
@@ -17,7 +33,11 @@ RC = \
 	data/rc/pacman-init \
 	data/rc/artix-live
 
-RUNIT_SV = $(wildcard data/runit/*.sh)
+RUNIT_CORE = \
+	data/runit/89-artix-live.sh
+
+RUNIT_SV = \
+	data/runit/pacman-init.run
 
 GRUB_DEFAULT = \
 	data/grub2-portable-efi
@@ -25,68 +45,70 @@ GRUB_DEFAULT = \
 GRUB_D = \
 	data/99_zzz-portable-efi
 
-all: $(BIN) $(RC) $(RUNIT_SV) $(XBIN) ${GRUB_D}
+all: $(BIN) $(RC) $(RUNIT_SV) $(XBIN) $(GRUB_D)
 
-edit = sed -e "s|@datadir[@]|$(DESTDIR)$(PREFIX)/share/artools|g" \
+EDIT = sed -e "s|@datadir[@]|$(DATADIR)/$(TOOLS)|g" \
-	-e "s|@sysconfdir[@]|$(DESTDIR)$(SYSCONFDIR)/artools|g" \
+	-e "s|@sysconfdir[@]|$(SYSCONFDIR)/$(TOOLS)|g" \
-	-e "s|@libdir[@]|$(DESTDIR)$(PREFIX)/lib/artools|g"
+	-e "s|@libdir[@]|$(LIBDIR)/$(TOOLS)|g"
 
 %: %.in Makefile
 	@echo "GEN $@"
 	@$(RM) "$@"
-	@m4 -P $@.in | $(edit) >$@
+	@$(M4) $@.in | $(EDIT) >$@
-	@chmod a-w "$@"
+	@$(CHAW) "$@"
-	@chmod +x "$@"
+	@$(CHX) "$@"
 
 clean:
-	rm -f $(BIN) $(RC) ${GRUB_D}
+	$(RM) $(BIN) $(RC) $(GRUB_D)
 
 install_base:
-	install -dm0755 $(DESTDIR)$(PREFIX)/bin
+	install $(DMODE) $(DESTDIR)$(BINDIR)
-	install -m0755 ${BIN} $(DESTDIR)$(PREFIX)/bin
+	install $(BMODE) $(BIN) $(DESTDIR)$(BINDIR)
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/lib/artools
+	install $(DMODE) $(DESTDIR)$(LIBDIR)/$(TOOLS)
-	install -m0644 ${LIBS} $(DESTDIR)$(PREFIX)/lib/artools
+	install $(FMODE) $(LIBS) $(DESTDIR)$(LIBDIR)/$(TOOLS)
 
-	install -dm0755 $(DESTDIR)$(PREFIX)/share/artools
+	install $(DMODE) $(DESTDIR)$(DATADIR)/$(TOOLS)
-	install -m0644 ${SHARED} $(DESTDIR)$(PREFIX)/share/artools
+	install $(FMODE) $(SHARED) $(DESTDIR)$(DATADIR)/$(TOOLS)
 
 install_rc:
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/init.d
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/init.d
-	install -m0755 ${RC} $(DESTDIR)$(SYSCONFDIR)/init.d
+	install $(BMODE) $(RC) $(DESTDIR)$(SYSCONFDIR)/init.d
 
 install_runit:
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/runit/core-services
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/runit/core-services
-	install -m0755 ${RUNIT_SV} $(DESTDIR)$(SYSCONFDIR)/runit/core-services
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/runit/sv/pacman-init
+	install $(BMODE) $(RUNIT_CORE) $(DESTDIR)$(SYSCONFDIR)/runit/core-services
+	install $(BMODE) $(RUNIT_SV) $(DESTDIR)$(SYSCONFDIR)/runit/sv/pacman-init/run
 
 install_portable_efi:
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/default
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/default
-	install -m0755 $(GRUB_DEFAULT) $(DESTDIR)$(SYSCONFDIR)/default
+	install $(BMODE) $(GRUB_DEFAULT) $(DESTDIR)$(SYSCONFDIR)/default
 
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/grub.d
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/grub.d
-	install -m0755 $(GRUB_D) $(DESTDIR)$(SYSCONFDIR)/grub.d
+	install $(BMODE) $(GRUB_D) $(DESTDIR)$(SYSCONFDIR)/grub.d
 
 uninstall_base:
-	for f in ${BIN}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
+	for f in $(notdir $(BIN)); do $(RM) $(DESTDIR)$(BINDIR)/$$f; done
-	for f in ${SHARED}; do rm -f $(DESTDIR)$(PREFIX)/share/artools/$$f; done
+	for f in $(notdir $(SHARED)); do $(RM) $(DESTDIR)$(DATADIR)/$(TOOLS)/$$f; done
-	for f in ${LIBS}; do rm -f $(DESTDIR)$(PREFIX)/lib/artools/$$f; done
+	for f in $(notdir $(LIBS)); do $(RM) $(DESTDIR)$(LIBDIR)/$(TOOLS)/$$f; done
 
 uninstall_portable_efi:
-	for f in ${GRUB_DEFAULT}; do rm -f $(DESTDIR)$(SYSCONFDIR)/default/$$f; done
+	for f in $(notdir $(GRUB_DEFAULT)); do $(RM) $(DESTDIR)$(SYSCONFDIR)/default/$$f; done
-	for f in ${GRUB_D}; do rm -f $(DESTDIR)$(SYSCONFDIR)/grub.d/$$f; done
+	for f in $(notdir $(GRUB_D)); do $(RM) $(DESTDIR)$(SYSCONFDIR)/grub.d/$$f; done
 
 uninstall_rc:
-	for f in ${RC}; do rm -f $(DESTDIR)$(SYSCONFDIR)/init.d/$$f; done
+	for f in $(notdir $(RC)); do $(RM) $(DESTDIR)$(SYSCONFDIR)/init.d/$$f; done
 
 uninstall_runit:
-	for f in ${RUNIT_SV}; do rm -f $(DESTDIR)$(SYSCONFDIR)/runit/sv/$$f; done
+	for f in $(notdir $(RUNIT_SV)); do $(RM) $(DESTDIR)$(SYSCONFDIR)/runit/sv/$$f; done
 
 install: install_base install_rc install_portable_efi
 
 uninstall: uninstall_base uninstall_rc uninstall_runit uninstall_portable_efi
 
 dist:
-	git archive --format=tar --prefix=live-services-$(Version)/ $(Version) | gzip -9 > live-services-$(Version).tar.gz
+	git archive --format=tar --prefix=$(PKG)-$(VERSION)/ $(VERSION) | gzip -9 > $(PKG)-$(VERSION).tar.gz
-	gpg --detach-sign --use-agent live-services-$(Version).tar.gz
+	gpg --detach-sign --use-agent $(PKG)-$(VERSION).tar.gz
 
 .PHONY: all clean install uninstall dist

data/runit/90-pacman-init.sh

@@ -1,6 +0,0 @@
-msg "Mounting temporary gnupg directory"
-mount -t tmpfs -o size=10M,mode=0755 tmpfs /etc/pacman.d/gnupg
-
-msg "Initializing pacman"
-pacman-key --init
-pacman-key --populate archlinux-artix

data/runit/pacman-init.run

@@ -0,0 +1,5 @@
+#!/bin/sh
+mount -t tmpfs -o size=10M,mode=0755 tmpfs /etc/pacman.d/gnupg
+pacman-key --init 1>&2
+pacman-key --populate archlinux artix 1>&2
+exec chpst -b pacman-init pause