diff --git a/Makefile.in b/Makefile.in index 11eaeeb2..62cf3b71 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1065,20 +1065,19 @@ $(FONTS_OBJ): ifeq ($(CONTAINER),) fonts: container-build # trigger container build - +else # ifeq ($(CONTAINER),) $(FONTS_OBJ)/%.ttf: $(FONTS_OBJ)/%.sfd $(FONTSCRIPT) | $(FONTS_OBJ) $(FONTFORGE) -script $(FONTSCRIPT) $< $($(*)_NAMES) $(FONTS_OBJ)/%.sfd: $(LIBERATION_SRCDIR)/%.sfd | $(FONTS_OBJ) patch $< -o $@ $(firstword $($(*)_PATCH) /dev/null) -# fonts below need a newer fontforge version then the one in the container fonts: $(FONTS_OBJ)/LiberationSans-Regular.ttf fonts: $(FONTS_OBJ)/LiberationSans-Bold.ttf fonts: $(FONTS_OBJ)/LiberationSerif-Regular.ttf fonts: $(FONTS_OBJ)/LiberationMono-Regular.ttf fonts: $(FONTS_OBJ)/LiberationMono-Bold.ttf -else # ifeq ($(CONTAINER),) + #The use of "YaHei" for compatibility with programs that require that exact string. This font is not Microsoft YaHei. $(FONTS_OBJ)/source-han/%.ttf: $$(%.ttf_CIDFONT) $$(%.ttf_FEATURES) $$(%.ttf_SEQUENCES) $$(%.ttf_UNISOURCE) $$(%.ttf_MENUNAMEDB) mkdir -p $(FONTS_OBJ)/source-han diff --git a/configure.sh b/configure.sh index 0f598219..beff4cea 100755 --- a/configure.sh +++ b/configure.sh @@ -113,13 +113,11 @@ function configure() { info "No build name specified, using default: $build_name" fi - dependency_command fontforge dependency_command find "findutils" dependency_command make "GNU Make" dependency_command rsync dependency_command wget dependency_command xz - dependency_command patch dependency_command git dependency_command python3