diff options
| author | Egbert Eich <eich@freedesktop.org> | 2011-05-19 18:18:52 +0200 |
|---|---|---|
| committer | Egbert Eich <eich@freedesktop.org> | 2012-11-30 09:07:29 -0500 |
| commit | 15d7f9cf9e089f5968a20f80529096e9a1d3551f (patch) | |
| tree | fc9f395f5c86f19978d13ffcb6c4fd822092502d | |
| parent | 690d6587e7e0ba29b70d2b1d6c5c6a128c5547a2 (diff) | |
Install ErrorDB into a $datarootdir-path, not $libdir.
This lets Xt search for it's ErrorDB in the same location
as Xlib. These error databases are architecture independent
data files.
The XtErrorDB file neither exists in libXt nor has it ever
been supplied by any '3rd party' (at least Google didn't
turn up any results).
Therefore changing the location of this file (again) should
have no side effects on backward compatibility.
Signed-off-by: Egbert Eich <eich@freedesktop.org>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Tested-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index d15b326..c59cc26 100644 --- a/configure.ac +++ b/configure.ac @@ -162,6 +162,9 @@ case $host_os in esac AC_SUBST(STRINGSABIOPTIONS) +ERRORDBDIR=${datadir}/X11 +AC_SUBST(ERRORDBDIR) + case $host_os in darwin*) OS_CFLAGS="-Wl,-flat_namespace" diff --git a/src/Makefile.am b/src/Makefile.am index cf54a5c..de60cfc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,7 +4,7 @@ BUILT_SOURCES = $(BUILT_FILES) CLEANFILES = $(BUILT_SOURCES) SRCH_DEFINES = -DXFILESEARCHPATHDEFAULT=\"$(XFILESEARCHPATHDEFAULT)\" -ERRORDB_DEFINES = -DERRORDB=\"$(libdir)/X11/XtErrorDB\" +ERRORDB_DEFINES = -DERRORDB=\"$(ERRORDBDIR)/XtErrorDB\" AM_CFLAGS = $(CWARNFLAGS) $(XT_CFLAGS) $(SRCH_DEFINES) $(ERRORDB_DEFINES) \ $(XTMALLOC_ZERO_CFLAGS) |