diff options
| author | Hiroki Sato <hrs@FreeBSD.org> | 2022-05-06 20:46:01 +0300 |
|---|---|---|
| committer | Hiroki Sato <hrs@FreeBSD.org> | 2022-05-06 20:46:01 +0300 |
| commit | 961eb1a13b72a9f6cd51ec2315c1664d6328fcc9 (patch) | |
| tree | d0ed62b97345c3780c34bc5d190ec442f614c9cb /x11-servers | |
| parent | 097c9235d921c27255e836c98874e3df62376711 (diff) | |
x11-servers/xorg-server: simplify DEFAULT_FONTPATH_LIST manipulation
Note that this involves no functional change.
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 7efbc03eeeb9..4ef6d11fbe49 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -49,7 +49,6 @@ DEFAULT_FONTPATH_LIST= \ ${FONTPATH_ROOT}/100dpi/ \ ${FONTPATH_ROOT}/75dpi/ \ catalogue:${FONTPATHD} -DEFAULT_FONTPATH_CMD=${ECHO_CMD} ${DEFAULT_FONTPATH_LIST} | ${TR} ' ' , PLIST_SUB+= FONTPATHD="${FONTPATHD:S,^${PREFIX}/,,}" USES= compiler:c11 cpe gl gmake perl5 ssl tar:xz xorg xorg-cat:xserver @@ -57,7 +56,7 @@ USE_PERL5= build USE_GL+= gl USE_XORG+= pixman xau xdmcp xfont2 xkbfile xorgproto xshmfence xtrans CONFIGURE_ARGS+=--without-doxygen --without-xmlto --without-fop \ - --with-default-font-path="$$(${DEFAULT_FONTPATH_CMD})" \ + --with-default-font-path="${DEFAULT_FONTPATH_LIST:ts,}" \ --without-dtrace --disable-config-hal \ --disable-install-setuid --disable-unit-tests \ --with-fallback-input-driver=libinput |