$NetBSD: patch-ai,v 1.4 1999/09/20 21:43:34 kim Exp $ --- config.h-dist.orig Sun Jun 6 18:22:28 1999 +++ config.h-dist Mon Sep 20 17:18:32 1999 @@ -13,6 +13,8 @@ #define RELEASE "6.5" +#define PREFIX "@PREFIX@" + #include #include @@ -71,7 +73,7 @@ * ascii files. (Thank you Geoff!) */ -/* #define NETWORK_DATABASE */ +#define NETWORK_DATABASE /********************************** NNTP ********************************* @@ -107,7 +109,7 @@ * NOTE: If you plan to use the included inews, it MUST be a full pathname */ -#define NNTP_SERVER "/usr/local/lib/nntp_server" +#define NNTP_SERVER PREFIX "/etc/nntp/server" /* * Define NNTP_POST if you want nn to reject attempts to post via @@ -149,7 +151,7 @@ * conf/s-template.h as a starting point for writing you own. */ -#include "s-hpux9-0.h" +#include "@SFILE@" /* * Define DEFAULT_PAGER as the initial value of the 'pager' variable. @@ -210,7 +212,7 @@ * conf/m-template.h as a starting point for writing you own. */ -#include "m-hp9000.h" +#include "@MFILE@" /***************************** OWNERSHIP *************************** @@ -227,8 +229,8 @@ * Common choices are: (news, news) and (your uid, your gid) */ -#define OWNER "news" -#define GROUP "news" +#define OWNER "@BINOWN@" +#define GROUP "@BINGRP@" /**************************** LOCALIZATION **************************** @@ -261,9 +263,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 "/lib/nn" +#ifndef _PATH_VARTMP +# define _PATH_VARTMP "/var/tmp" +#endif +#define TMP_DIRECTORY _PATH_VARTMP /**************************** DATABASE LOCATION ************************** * @@ -318,7 +323,7 @@ /* #define NEWS_DIRECTORY "/usr/spool/news" */ /* #define NEWS_LIB_DIRECTORY "/usr/lib/news" */ -/* #define INEWS_PATH "/usr/lib/news/inews" */ +#define INEWS_PATH BIN_DIRECTORY "/inews" /* @@ -341,7 +346,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 */ /* @@ -403,13 +411,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"