diff --git a/Makefile b/Makefile index 026224ab0..f168dfd68 100644 --- a/Makefile +++ b/Makefile @@ -389,27 +389,47 @@ install_ttf: all_ttf_const @echo "Installing TTF files locally at ~/Library/Fonts/Inter" rm -rf ~/'Library/Fonts/Inter' mkdir -p ~/'Library/Fonts/Inter' - cp -va $(FONTDIR)/const/*.ttf ~/'Library/Fonts/Inter' + cp -a $(FONTDIR)/const/*.ttf ~/'Library/Fonts/Inter' install_ttf_hinted: all_ttf_hinted @echo "Installing autohinted TTF files locally at ~/Library/Fonts/Inter" rm -rf ~/'Library/Fonts/Inter' mkdir -p ~/'Library/Fonts/Inter' - cp -va $(FONTDIR)/const-hinted/*.ttf ~/'Library/Fonts/Inter' + cp -a $(FONTDIR)/const-hinted/*.ttf ~/'Library/Fonts/Inter' -install_otf: all_otf +install_text_otf: all_text_otf @echo "Installing OTF files locally at ~/Library/Fonts/Inter" rm -rf ~/'Library/Fonts/Inter' mkdir -p ~/'Library/Fonts/Inter' - cp -va $(FONTDIR)/const/*.otf ~/'Library/Fonts/Inter' + cp -a $(FONTDIR)/const/Inter-*.otf ~/'Library/Fonts/Inter' -install_var_v: $(FONTDIR)/var/Inter-V.var.otf +install_display_otf: all_display_otf + @echo "Installing OTF files locally at ~/Library/Fonts/InterDisplay" + rm -rf ~/'Library/Fonts/InterDisplay' + mkdir -p ~/'Library/Fonts/InterDisplay' + cp -a $(FONTDIR)/const/InterDisplay-*.otf ~/'Library/Fonts/InterDisplay' + +install_text_var: $(FONTDIR)/var/Inter-V.var.otf mkdir -p ~/'Library/Fonts/Inter' - cp -va $(FONTDIR)/var/Inter-V.var.otf ~/'Library/Fonts/Inter/Inter-V.otf' + cp -a $(FONTDIR)/var/Inter-V.var.otf ~/'Library/Fonts/Inter/Inter-V.otf' -install: install_otf install_var_v +install_display_var: $(FONTDIR)/var/InterDisplay-V.var.otf + mkdir -p ~/'Library/Fonts/InterDisplay' + cp -a $(FONTDIR)/var/Inter-V.var.otf ~/'Library/Fonts/InterDisplay/InterDisplay-V.otf' -.PHONY: install install_otf install_ttf +install: install_text install_display +install_otf: install_text_otf install_display_otf +install_text: install_text_otf install_text_var +install_display: install_display_otf install_display_var + +# deprecated aliases +install_var_v: + @echo 'Please use `make install_text_var` or `make install_display_var` instead.' >&2 + @exit 1 + +.PHONY: install_ttf install_ttf_hinted install_text_otf install_display_otf install_otf +.PHONY: install_text_var install_display_var install_var_v +.PHONY: install install_text install_display diff --git a/init.sh b/init.sh index a7cab914d..64fea0859 100755 --- a/init.sh +++ b/init.sh @@ -543,6 +543,20 @@ else done echo "" >> "$GEN_MAKE_FILE" + # all_text_otf target + echo -n "all_text_otf:" >> "$GEN_MAKE_FILE" + for style in "${all_styles[@]}"; do + echo -n " ${style}_otf" >> "$GEN_MAKE_FILE" + done + echo "" >> "$GEN_MAKE_FILE" + + # all_display_otf target + echo -n "all_display_otf:" >> "$GEN_MAKE_FILE" + for style in "${all_styles[@]}"; do + echo -n " display_${style}_otf" >> "$GEN_MAKE_FILE" + done + echo "" >> "$GEN_MAKE_FILE" + # all_ttf target echo -n "all_ttf:" >> "$GEN_MAKE_FILE" for style in "${all_styles[@]}"; do