From 544946411e3590e96198f8c3308418c4c456dd77 Mon Sep 17 00:00:00 2001 From: H.G.Muller Date: Fri, 11 Mar 2016 16:54:25 +0100 Subject: [PATCH] Let configure supply path to manual file A new macro MANDIR is passed fro the configure process to the compiler in a -D option to inform XBoard where to find its manual page. --- Makefile.am | 2 +- dialogs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index f202a12..a3051ba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,7 +70,7 @@ DISTCLEANFILES = stamp-h GITVERSION=$(shell sh -c 'git describe --dirty --always 2>/dev/null') AM_CPPFLAGS=-DINFODIR='"$(infodir)"' @X_CFLAGS@ @CAIRO_CFLAGS@ @FRONTEND_CFLAGS@ -DSYSCONFDIR='"$(sysconfdir)"' \ -DLOCALEDIR='"$(localedir)"' -DSVGDIR='"$(svgdir)"' -D__GIT_VERSION='"$(GITVERSION)"' \ - -DCONFIGURE_OPTIONS='"@CONFIGURE_OPTIONS@"' -DDATADIR='"$(datadir)/games/xboard"' $(headers) + -DCONFIGURE_OPTIONS='"@CONFIGURE_OPTIONS@"' -DDATADIR='"$(datadir)/games/xboard"' -DMANDIR='"$(mandir)"' $(headers) ACLOCAL_AMFLAGS = -I m4 diff --git a/dialogs.c b/dialogs.c index ece6c40..eecf453 100644 --- a/dialogs.c +++ b/dialogs.c @@ -2491,7 +2491,7 @@ GetHelpText (FILE *f, char *name) void DisplayHelp (char *name) { - char *manFile = DATADIR "/../../man/man6/xboard.6"; + char *manFile = MANDIR "/man6/xboard.6"; FILE *f = fopen(manFile, "r"); if(f) { GetHelpText(f, name); -- 1.7.0.4