aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-04-23 18:22:45 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-05-10 16:24:03 +0200
commit78a16245a4bbf13acf53768064d81cbaa28c0d8b (patch)
treec01c2c6f365fff1d02cc178841bc31eb6e8c2ec9 /nx-X11/programs
parent898f04e4293ce9cf7fcab810e8b27404cf0b6fde (diff)
downloadnx-libs-78a16245a4bbf13acf53768064d81cbaa28c0d8b.tar.gz
nx-libs-78a16245a4bbf13acf53768064d81cbaa28c0d8b.tar.bz2
nx-libs-78a16245a4bbf13acf53768064d81cbaa28c0d8b.zip
auto-determine system font path and add to list of font paths
This will help on non-supported platforms as it will add a path the current code might not be aware of.
Diffstat (limited to 'nx-X11/programs')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Font.c1
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Imakefile1
2 files changed, 2 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Font.c b/nx-X11/programs/Xserver/hw/nxagent/Font.c
index d5c9f8982..89128d4c1 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Font.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Font.c
@@ -72,6 +72,7 @@ is" without express or implied warranty.
#undef DEBUG
const char * nxagentFontDirs[] = {
+ SYSTEMFONTDIR,
"/usr/share/nx/fonts",
"/usr/share/X11/fonts",
"/usr/share/fonts/X11",
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
index 6e68b80fc..ddbf08fab 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile
+++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
@@ -255,6 +255,7 @@ DEFINES = \
-DRANDR_15_INTERFACE=1 \
-DPANORAMIX \
-UDEBUG_TREE \
+ -DSYSTEMFONTDIR=\"$(SYSTEMFONTDIR)\" \
$(NULL)
all:: $(OBJS)