--- Makefile.ORG	Sun Sep 22 20:00:16 1996
+++ Makefile	Wed Nov 20 23:03:00 1996
@@ -51,11 +51,11 @@
 # Where the configuration files live.
 RADDB		= ./raddb
 # Some installation stuff.
-DAEMON_INSDIR	= /usr/private/etc
-BIN_INSDIR	= /usr/private/etc
-MAN_INSDIR	= /usr/local/man
-RADDB_INSDIR	= /usr/private/etc/raddb
-RADACCT_INSDIR	= /usr/private/etc/radacct
+DAEMON_INSDIR	= ${PREFIX}/sbin
+BIN_INSDIR	= ${PREFIX}/bin
+MAN_INSDIR	= ${PREFIX}/man
+RADDB_INSDIR	= ${PREFIX}/lib/radius/db
+RADACCT_INSDIR	= ${PREFIX}/lib/radius/acct
 # The server does not need to be owned by root, unless some shadow password
 # scheme needs it.  You might create a user id "radius" for just this purpose.
 # The O G and M macros are for AIX, OSF/1 and HP-UX, see below.
@@ -66,7 +66,7 @@
 RADGRP		= bin
 
 # Define COMPRESS to hold the name of your favourite compress program:
-#COMPRESS	= -DRADIUS_COMPRESS=\"/usr/local/bin/gzip\"
+COMPRESS	= -DRADIUS_COMPRESS=\"/usr/bin/gzip\"
 
 # Define SRV to hold any combination of server names you'd like to override:
 #SRV3	  = -DDEFAULT_TACACS_SERVER=\"vms.dns.name\"
@@ -219,12 +219,12 @@
 #
 #--------------------------------------------------------------------------
 
-CC	  = cc
-CFLAGS	  = -g $(DEFS) $(INCS)
-LDFLAGS	  =
-LIBS	  =
-RANLIB	  = ranlib
-INSTALL	  = /bin/install
+#CC	  = cc
+#CFLAGS	  = -g $(DEFS) $(INCS)
+#LDFLAGS	  =
+#LIBS	  =
+#RANLIB	  = ranlib
+#INSTALL	  = /bin/install
 
 #
 # Solaris 2.x
@@ -304,14 +304,17 @@
 #
 #--------------------------------------------------------------------------
 
-#CC	  = cc
-#CFLAGS	  = -O $(DEFS) $(INCS)
-#LDFLAGS	  =
-#LIBS	  = -lcrypt -lcompat
-#MOSTUTIL  = $(RADCHECK) $(RADPWTST) $(RADPASS) $(DNSCHECK)
-#RANLIB	  = ranlib
-#INSTALL	  = /usr/bin/install
-
+CC	  = cc
+CFLAGS += -DRADIUS_DIR=\"${PREFIX}/lib/radius/db\" \
+	-DRADACCT_DIR=\"${PREFIX}/lib/radius/acct\" \
+	-DRADIUS_COMPRESS=\"/usr/bin/gzip\" \
+	$(DEFS)
+LDFLAGS	  =
+LIBS	  = -lcrypt -lcompat
+MOSTUTIL  = $(RADCHECK) $(RADPWTST) $(RADPASS) $(DNSCHECK)
+RANLIB	  = ranlib
+INSTALL	  = /usr/bin/install -c
+  
 #
 # AIX 3.2.5 (if using xlc(1) add -D_ALL_SOURCE to CFLAGS below)
 #
@@ -604,8 +607,6 @@
 						$(MAN_INSDIR)/man5/clients.5
 	$(INSTALL) $(M) 644 $(O) $(RADOWN) $(G) $(RADGRP) $(MAN)/dictionary.5 \
 						$(MAN_INSDIR)/man5/dictionary.5
-	$(INSTALL) $(M) 644 $(O) $(RADOWN) $(G) $(RADGRP) $(MAN)/radbnr.conf.5 \
-						$(MAN_INSDIR)/man5/radbnr.conf.5
 	$(INSTALL) $(M) 644 $(O) $(RADOWN) $(G) $(RADGRP) $(MAN)/radius.fsm.5 \
 						$(MAN_INSDIR)/man5/radius.fsm.5
 	$(INSTALL) $(M) 644 $(O) $(RADOWN) $(G) $(RADGRP) $(MAN)/users.5 \
@@ -625,17 +626,17 @@
 		/bin/mkdir -p $(RADDB_INSDIR) ;\
 	fi
 	$(INSTALL) $(M) 660 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/authfile \
-						$(RADDB_INSDIR)/authfile
+						$(RADDB_INSDIR)/authfile.sample
 	$(INSTALL) $(M) 660 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/clients \
-						$(RADDB_INSDIR)/clients
+						$(RADDB_INSDIR)/clients.sample
 	$(INSTALL) $(M) 755 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/conversion.pl \
-						$(RADDB_INSDIR)/conversion.pl
+						$(RADDB_INSDIR)/conversion.pl.sample
 	$(INSTALL) $(M) 644 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/dictionary \
-						$(RADDB_INSDIR)/dictionary
+						$(RADDB_INSDIR)/dictionary.sample
 	$(INSTALL) $(M) 660 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/users \
-						$(RADDB_INSDIR)/users
+						$(RADDB_INSDIR)/users.sample
 	$(INSTALL) $(M) 644 $(O) $(RADOWN) $(G) $(RADGRP) $(RADDB)/xas.fsm \
-						$(RADDB_INSDIR)/xas.fsm
+						$(RADDB_INSDIR)/xas.fsm.sample
 	-if [ ! -d $(RADACCT_INSDIR) ] ;\
 	then \
 		/bin/mkdir -p $(RADACCT_INSDIR) ;\