~olbohlen/oi-userland.git

OpenIndiana Userland

parent: 20b13a22 | patch | commit | ignore whitespace

Aurelien Larcher

2019-08-10 c356c902b03e321171ad4bc4b7e647b5902571c0

font: fix consistency in macros

3 files modified

	components/fonts/misc-ethiopic/Makefile	4 ●●●●● patch \| view \| raw \| blame \| history
	components/fonts/misc-meltho/Makefile	2 ●●●●● patch \| view \| raw \| blame \| history
	make-rules/font.mk	6 ●●●●● patch \| view \| raw \| blame \| history

 components/fonts/misc-ethiopic/Makefile

@@ -42,5 +42,5 @@
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)

 components/fonts/misc-meltho/Makefile

@@ -42,4 +42,4 @@
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)

 make-rules/font.mk

@@ -51,9 +51,9 @@
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

			@@ -42,5 +42,5 @@
			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_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 @@
			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