From fd77eeedbd0d122afd6eceb314f93b733527f2f6 Mon Sep 17 00:00:00 2001 From: Vovanium Date: Wed, 6 Jul 2022 16:35:19 +0300 Subject: [PATCH] User install target --- Makefile | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 7763f19..548aa3f 100644 --- a/Makefile +++ b/Makefile @@ -56,24 +56,33 @@ build/pcf/salut-mono%.pcf : mono/salut-mono%.bdf mkdir -p $(@D) bdftopcf -o $@ $^ -.PHONY : install-user install-user-mono install-user-sans - -install-user: install-user-mono install-user-sans - mkfontdir $(INSTALL_DIR_USER) - fc-cache -fv +.PHONY : install-user install-user-mono install-user-sans refresh-cache FILES_MONO=$(wildcard mono/*.bdf) INSTALL_USER_FILES_MONO=$(FILES_MONO:mono/%=$(INSTALL_DIR_USER)/%) install-user-mono : $(INSTALL_USER_FILES_MONO) + mkfontdir $(INSTALL_DIR_USER) + fc-cache -fv $(INSTALL_USER_FILES_MONO) : $(INSTALL_DIR_USER)/% : mono/% $(INSTALL_DIR_USER) cp $< $@ + +FILES_SANS=$(wildcard sans/*.bdf) +INSTALL_USER_FILES_SANS=$(FILES_SANS:sans/%=$(INSTALL_DIR_USER)/%) + +install-user-sans : $(INSTALL_USER_FILES_SANS) + mkfontdir $(INSTALL_DIR_USER) + fc-cache -fv + +$(INSTALL_USER_FILES_SANS) : $(INSTALL_DIR_USER)/% : sans/% $(INSTALL_DIR_USER) + cp $< $@ + +install-user : $(INSTALL_USER_FILES_MONO) $(INSTALL_USER_FILES_SANS) + mkfontdir $(INSTALL_DIR_USER) + fc-cache -fv + $(INSTALL_DIR_USER): mkdir -p $@ -test: - echo 'INSTALL_DIR_USER' $(INSTALL_DIR_USER) - echo 'FILES_MONO ' $(FILES_MONO) - echo 'INSTALL_FILES ' $(INSTALL_USER_FILES_MONO) \ No newline at end of file