From d26c0de598b9bf04d8cc62503c53c83c6ebef48c Mon Sep 17 00:00:00 2001 From: xtraeme Date: Wed, 9 Feb 2005 20:11:22 +0000 Subject: Apply patch from Jeremy C. Reed to define common values for the manual pages on Linux. --- meta-pkgs/XFree86/Makefile.common | 6 +++++- x11/XFree86-server/files/host.def | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/meta-pkgs/XFree86/Makefile.common b/meta-pkgs/XFree86/Makefile.common index 49fba6069c1..26fd1d9709f 100644 --- a/meta-pkgs/XFree86/Makefile.common +++ b/meta-pkgs/XFree86/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.19 2004/11/07 12:57:37 markd Exp $ +# $NetBSD: Makefile.common,v 1.20 2005/02/09 20:11:22 xtraeme Exp $ # # XBUILD_DIRS is the group of directories under ${WRKSRC} that will # be built in. @@ -186,6 +186,10 @@ post-extract: -e "s|@LOCALBASE@|${LOCALBASE}|g" \ -e "s|@LDFLAGS@|${GLOBAL_LDFLAGS}|g" \ -e "s|@WRKSRC@|${WRKSRC}|g" \ + -e "s|@KERNMAN_SUFFIX@|${KERNMAN_SUFFIX}|g" \ + -e "s|@MISCMAN_SUFFIX@|${MISCMAN_SUFFIX}|g" \ + -e "s|@KERNMAN_DIR@|${KERNMAN_DIR}|g" \ + -e "s|@MISCMAN_DIR@|${MISCMAN_DIR}|g" \ ${FILESDIR}/host.def > ${WRKSRC}/config/cf/host.def @${LN} -sf ${X11ROOT}/bin/gccmakedep ${WRKSRC}/config/util @${LN} -sf ${X11ROOT}/bin/revpath ${WRKSRC}/config/util diff --git a/x11/XFree86-server/files/host.def b/x11/XFree86-server/files/host.def index a6a46c31d3f..6fee033fb6b 100644 --- a/x11/XFree86-server/files/host.def +++ b/x11/XFree86-server/files/host.def @@ -1,4 +1,4 @@ -/* $NetBSD: host.def,v 1.3 2004/03/28 22:06:16 xtraeme Exp $ */ +/* $NetBSD: host.def,v 1.4 2005/02/09 20:11:22 xtraeme Exp $ */ #define ProjectRoot @PREFIX@ #define BuildHtmlManPages NO @@ -39,3 +39,8 @@ #define FontconfigDir @BLNK@ #define BuildHtmlManPages NO + +#define DriverManSuffix @KERNMAN_SUFFIX@ +#define MiscManSuffix @MISCMAN_SUFFIX@ +#define MiscManDir @PREFIX@/@MISCMAN_DIR@ +#define DriverManDir @PREFIX@/@KERNMAN_DIR@ -- cgit v1.2.3