$NetBSD: patch-aa,v 1.5 2002/07/06 20:15:52 tv Exp $

--- config.make.orig	Mon Aug 20 01:23:53 2001
+++ config.make	Sat Jul  6 15:19:41 2002
@@ -56,13 +56,13 @@
 #
 
 # variable parameters, can be changed at run-time, DO NOT DELETE ANYTHING!!!
-DEFAULT_V_CONFIGDIR	= /etc/fidogate
-DEFAULT_V_LIBDIR	= /usr/lib/fidogate
-DEFAULT_V_BINDIR	= $(DEFAULT_V_LIBDIR)/bin
-DEFAULT_V_LOGDIR	= /var/log/fidogate
-DEFAULT_V_VARDIR	= /var/lib/fidogate
-DEFAULT_V_LOCKDIR	= /var/lock/fidogate
-DEFAULT_V_SPOOLDIR	= /var/spool/fidogate
+DEFAULT_V_CONFIGDIR	= @PKG_SYSCONFDIR@/fidogate
+DEFAULT_V_LIBDIR	= @PREFIX@/lib/fidogate
+DEFAULT_V_BINDIR	= @PREFIX@/lib/fidogate/bin
+DEFAULT_V_LOGDIR	= /var/log/fido
+DEFAULT_V_VARDIR	= /var/spool/fido
+DEFAULT_V_LOCKDIR	= /var/spool/fido/lock
+DEFAULT_V_SPOOLDIR	= /var/spool/fido
 DEFAULT_V_BTBASEDIR	= /var/spool/bt
 DEFAULT_V_INBOUND	= $(DEFAULT_V_BTBASEDIR)/in
 DEFAULT_V_PINBOUND	= $(DEFAULT_V_BTBASEDIR)/pin
@@ -83,17 +83,17 @@
 
 # fixed parameters, DO NOT DELETE ANYTHING!!!
 # INN (Redhat 5.2)
-DEFAULT_F_NEWSETCDIR	= /etc/news
-DEFAULT_F_NEWSVARDIR	= /var/lib/news
+DEFAULT_F_NEWSETCDIR	= /var/news/etc
+DEFAULT_F_NEWSVARDIR	= /var/news
 # INN 1.7
 #DEFAULT_F_NEWSLIBDIR	= /usr/lib/news
 #DEFAULT_F_NEWSSPOOLDIR	= /var/spool/news
 # INN 2.2
-DEFAULT_F_NEWSLIBDIR	= /usr/lib
-DEFAULT_F_NEWSSPOOLDIR	= /var/spool/news/articles
+DEFAULT_F_NEWSLIBDIR	= @PREFIX@/inn/lib
+DEFAULT_F_NEWSSPOOLDIR	= /var/news/spool/articles
 # ifcico-3.0.cm.alpha-4.1
 #DEFAULT_F_IFMAILDIR     = /usr/lib/ifmail
-DEFAULT_F_IFMAILDIR     = /usr/lib/ifcico
+DEFAULT_F_IFMAILDIR     = @PREFIX@/sbin
 
 # old-style config
 #DEFAULT_F_CONFIG_GATE	= %C/gate.conf
@@ -146,18 +146,15 @@
 
 
 # The perl interpreter used by subst.pl
-PERL			= /usr/bin/perl
+PERL			= @PREFIX@/bin/perl
 
 # Directory with sendmail m4 configuration files
-# RedHat 6.x
-#SENDMAIL_CF_DIR		= /usr/lib/sendmail-cf
-# RedHat 7.x
-SENDMAIL_CF_DIR		= /usr/share/sendmail-cf
+SENDMAIL_CF_DIR		= /usr/share/sendmail
 
 # Directories for installing documentation, not used by subst.pl
-INFODIR			= /usr/info
-HTMLDIR			= /html/fidogate
-HTMLLOGDIR		= /html/log
+INFODIR			= @PREFIX@/info
+HTMLDIR			= @PREFIX@/share/doc/fidogate
+HTMLLOGDIR		= @PREFIX@/share/fidogate
 
 # RedHat RPM related dirs
 RPMBASEDIR	= /usr/src/redhat
@@ -197,20 +194,17 @@
 # install permissions
 PERM_PROG	= 755
 PERM_DATA	= 644
-PERM_SETUID	= 4755
+PERM_SETUID	= 4111
 PERM_DIR	= 755
 
 # C compiler / flags
-CC		= gcc
-# YACC		= yacc					# Use yacc, not bison
-YACC		= bison -y
+YACC		= yacc					# Use yacc, not bison
 AR		= ar
 # RANLIB	= @echo >/dev/null			# No ranlib
 RANLIB		= ranlib
 # RANLIB	= ar s					# OS2
 
 # DEBUG		= -O2
-DEBUG		= -g
 
 INCLUDE		= -I$(TOPDIR) -I$(TOPDIR)/src/include
 
@@ -239,10 +233,10 @@
 # MSDOS, OS2, WIN32
 # EXE		= .exe
 EXE		=
-INSTALL_PROG	= $(INSTALL) -c -g $(GROUP) -o $(OWNER) -m $(PERM_PROG)
-INSTALL_DATA	= $(INSTALL) -c -g $(GROUP) -o $(OWNER) -m $(PERM_DATA)
-INSTALL_SETUID	= $(INSTALL) -c -g $(GROUP) -o $(OWNER) -m $(PERM_SETUID)
-INSTALL_DIR	= $(INSTALL) -g $(GROUP) -o $(OWNER) -m $(PERM_DIR) -d
+INSTALL_PROG	= $(BSD_INSTALL_SCRIPT)
+INSTALL_DATA	= $(BSD_INSTALL_DATA)
+INSTALL_SETUID	= $(BSD_INSTALL_PROGRAM) -g $(GROUP) -o $(OWNER) -m $(PERM_SETUID)
+INSTALL_DIR	= $(BSD_INSTALL_DATA_DIR) -g $(GROUP) -o $(OWNER) -m $(PERM_DIR) -d
 # extra prefix for installation
 PREFIX		=