Skip to content
Permalink
Browse files

font: fix consistency in macros

  • Loading branch information...
alarcher committed Aug 10, 2019
1 parent 20b13a2 commit c356c902b03e321171ad4bc4b7e647b5902571c0
Showing with 6 additions and 6 deletions.
  1. +2 −2 components/fonts/misc-ethiopic/Makefile
  2. +1 −1 components/fonts/misc-meltho/Makefile
  3. +3 −3 make-rules/font.mk
@@ -42,5 +42,5 @@ COMPONENT_FONT_NAME = ethiopic
COMPONENT_FONT_PKG = misc-ethiopic

# Install to separate directory for easier packaging
CONFIGURE_OPTIONS += --with-ttf-fontdir=$(USRSHARETTFONTSDIR)/$(COMPONENT_FONT_NAME)
CONFIGURE_OPTIONS += --with-otf-fontdir=$(USRSHAREOTFONTSDIR)/$(COMPONENT_FONT_NAME)
CONFIGURE_OPTIONS += --with-ttf-fontdir=$(USRSHARETTFFONTSDIR)/$(COMPONENT_FONT_NAME)
CONFIGURE_OPTIONS += --with-otf-fontdir=$(USRSHAREOTFFONTSDIR)/$(COMPONENT_FONT_NAME)
@@ -42,4 +42,4 @@ COMPONENT_FONT_NAME = syriac
COMPONENT_FONT_PKG = misc-meltho

# Install to separate directory for easier packaging
CONFIGURE_OPTIONS += --with-fontdir=$(USRSHARETTFONTSDIR)/$(COMPONENT_FONT_NAME)
CONFIGURE_OPTIONS += --with-fontdir=$(USRSHARETTFFONTSDIR)/$(COMPONENT_FONT_NAME)
@@ -51,9 +51,9 @@ X11MISCFONTDIR = X11
PKGFONTDIR?= $($(FONT_TYPE)FONTDIR)

# For compatibility
USRSHARETTFONTSDIR = $(USRSHAREFONTSDIR)/$(TTFFONTDIR)
USRSHAREOTFONTSDIR = $(USRSHAREFONTSDIR)/$(OTFFONTDIR)
USRSHAREX11FONTSDIR= $(USRSHAREFONTSDIR)/$(X11FONTDIR)
USRSHARETTFFONTSDIR = $(USRSHAREFONTSDIR)/$(TTFFONTDIR)
USRSHAREOTFFONTSDIR = $(USRSHAREFONTSDIR)/$(OTFFONTDIR)
USRSHAREX11FONTSDIR = $(USRSHAREFONTSDIR)/$(X11FONTDIR)

TTFFONTSRC = ttf
OTFFONTSRC = otf

0 comments on commit c356c90

Please sign in to comment.
You can’t perform that action at this time.