$NetBSD: patch-ai,v 1.6 2004/05/03 12:56:10 kim Exp $ --- config.h-dist.orig Thu Feb 6 18:06:02 2003 +++ config.h-dist Fri Apr 8 22:20:37 2005 @@ -11,6 +11,9 @@ * (c) Copyright 1990, Kim F. Storm. All rights reserved. */ +#define PREFIX "@PREFIX@" +#define PKG_SYSCONFDIR "@PKG_SYSCONFDIR@" + #include #include @@ -66,7 +69,7 @@ * ascii files. (Thank you Geoff!) */ -/* #define NETWORK_DATABASE */ +#define NETWORK_DATABASE /********************************** NNTP ********************************* @@ -100,7 +103,7 @@ * LIB_DIRECTORY defined below. */ -#define NNTP_SERVER "/usr/local/lib/nntp_server" +#define NNTP_SERVER PKG_SYSCONFDIR "/server" /* * Define NNTP_PATH_HOSTNAME to force a specific hostname into the @@ -138,7 +141,7 @@ * conf/s-template.h as a starting point for writing you own. */ -#include "s-sunos5.h" +#include "@SFILE@" /********************** MACHINE DEPENDENT DEFINITIONS ********************** @@ -149,7 +152,7 @@ * conf/m-template.h as a starting point for writing you own. */ -#include "m-sparc.h" +#include "@MFILE@" /**************************** LOCALIZATION **************************** @@ -182,8 +185,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 /*************************** NEWS TRANSPORT ************************** @@ -258,7 +265,10 @@ */ /* #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 */ /* @@ -307,13 +317,13 @@ * DAEMON_MAN - nnmaster */ -#define USER_MAN_DIR "/usr/local/man/man1" +#define USER_MAN_DIR PREFIX "/man/man1" #define USER_MAN_SECTION "1" -#define SYS_MAN_DIR "/usr/local/man/man1" -#define SYS_MAN_SECTION "1m" +#define SYS_MAN_DIR PREFIX "/man/man1" +#define SYS_MAN_SECTION "1" -#define DAEMON_MAN_DIR "/usr/local/man/man8" +#define DAEMON_MAN_DIR PREFIX "/man/man8" #define DAEMON_MAN_SECTION "8" @@ -383,8 +393,8 @@ * Common choices are: (news, news) and (your uid, your gid) */ -#define OWNER "news" -#define GROUP "news" +#define OWNER "@BINOWN@" +#define GROUP "@BINGRP@" /* * Default folder directory