$NetBSD: patch-ai,v 1.9 2006/11/12 01:28:03 rillig Exp $ --- config.h-dist.orig 2005-04-01 22:44:22.000000000 +0200 +++ config.h-dist 2006-11-12 02:24:05.000000000 +0100 @@ -11,6 +11,9 @@ * (c) Copyright 1990, Kim F. Storm. All rights reserved. */ +#define PREFIX "@PREFIX@" +#define PKG_SYSCONFDIR "@PKG_SYSCONFDIR@" +#define MANDIR "@PREFIX@/@PKGMANDIR@" /* * The Good Net-Keeping Seal of Approval folks seem to think it necessary to @@ -68,7 +71,7 @@ * LIB_DIRECTORY defined below. */ -#define NNTP_SERVER "/usr/local/lib/nntp_server" +#define NNTP_SERVER PKG_SYSCONFDIR "/server" /* * Define your local domain name. If you leave this undefined, nn will @@ -95,7 +98,7 @@ * conf/s-template.h as a starting point for writing you own. */ -#include "s-sunos5.h" +#include "@SFILE@" /* * Define DEFAULT_PAGER as the initial value of the 'pager' variable. @@ -122,7 +125,7 @@ * conf/m-template.h as a starting point for writing you own. */ -#include "m-sparc.h" +#include "@MFILE@" /***************************** OWNERSHIP *************************** @@ -139,8 +142,8 @@ * Common choices are: (news, news) and (your uid, your gid) */ -#define OWNER "news" -#define GROUP "news" +#define OWNER "@BINOWN@" +#define GROUP "@BINGRP@" /**************************** LOCALIZATION **************************** @@ -173,8 +176,12 @@ * (= LIB_DIRECTORY/Log if undefined). */ -#define BIN_DIRECTORY "/usr/local/bin" -#define LIB_DIRECTORY "/usr/local/lib/nn" +#define BIN_DIRECTORY PREFIX "/bin" +#define LIB_DIRECTORY PREFIX "/share/nn" +#ifndef _PATH_VARTMP +# define _PATH_VARTMP "/var/tmp" +#endif +#define TMP_DIRECTORY _PATH_VARTMP /*************************** MAIL INTERFACE ************************* @@ -189,7 +196,11 @@ */ /* #define REC_MAIL "/usr/lib/news/recmail" */ /* non-sendmail */ -#define REC_MAIL "/usr/lib/sendmail -t" /* sendmail */ +#ifndef _PATH_SENDMAIL +# define _PATH_SENDMAIL "/usr/lib/sendmail" +#endif +#define REC_MAIL _PATH_SENDMAIL " -t" /* sendmail */ + /* * nn needs to know the name of your host. @@ -237,13 +248,17 @@ * DAEMON_MAN - nnmaster */ -#define USER_MAN_DIR "/usr/local/man/man1" +#ifndef MANDIR +#define MANDIR PREFIX "/man" +#endif + +#define USER_MAN_DIR MANDIR "/man1" #define USER_MAN_SECTION "1" -#define SYS_MAN_DIR "/usr/local/man/man1" -#define SYS_MAN_SECTION "1m" +#define SYS_MAN_DIR MANDIR "/man1" +#define SYS_MAN_SECTION "1" -#define DAEMON_MAN_DIR "/usr/local/man/man8" +#define DAEMON_MAN_DIR MANDIR "/man8" #define DAEMON_MAN_SECTION "8" @@ -374,7 +389,7 @@ * performance (no data conversion is needed). */ -/* #define NETWORK_DATABASE */ +#define NETWORK_DATABASE /**************************** DATABASE LOCATION **************************