--- raddb/Makefile.orig	Thu Apr 14 21:31:54 2005
+++ raddb/Makefile	Thu Apr 14 21:36:19 2005
@@ -7,7 +7,7 @@
 	  experimental.conf hints huntgroups ldap.attrmap \
 	  mssql.conf naslist naspasswd oraclesql.conf postgresql.conf \
 	  preproxy_users proxy.conf radiusd.conf realms snmp.conf \
-	  sql.conf users x99.conf x99passwd.sample
+	  sql.conf users x99.conf
 
 all:
 
@@ -15,26 +15,12 @@
 	$(INSTALL) -d -m 755	$(R)$(raddbdir)
 	@echo "Creating/updating files in $(R)$(raddbdir)"; \
 	for i in $(FILES); do \
-		[ ! -f $(R)$(raddbdir)/$$i ] && $(INSTALL) -m 644 $$i $(R)$(raddbdir); \
-		if [ "`find $$i -newer $(R)$(raddbdir)/$$i`" ]; then \
-			echo "** $(R)$(raddbdir)/$$i"; \
-			nt=1; \
-		fi; \
-	done; \
-	if [ "$$nt" ]; then \
-		echo "**";\
-		echo "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **";\
-		echo "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **";\
-		echo "**";\
-		echo "** The sample configuration files in `pwd`";\
-		echo "** are newer than those in $(R)$(raddbdir)";\
-		echo "**";\
-		echo "** Please investigate and manually copy (if appropriate) the files listed above.";\
-		echo "**";\
-		echo "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **";\
-		echo "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **";\
-	fi
-	chmod 640 $(R)$(raddbdir)/naspasswd $(R)$(raddbdir)/clients $(R)$(raddbdir)/clients.conf
+		$(INSTALL) -m 644 $$i $(R)$(raddbdir)/$$i.sample; \
+	done
+	$(INSTALL) -m 644 x99passwd.sample $(R)$(raddbdir)
+	chmod 640 $(R)$(raddbdir)/naspasswd.sample \
+		$(R)$(raddbdir)/clients.sample \
+		$(R)$(raddbdir)/clients.conf.sample
 	if [ ! -d $(R)$(raddbdir)/certs ]; then \
 		mkdir $(R)$(raddbdir)/certs; \
 		mkdir $(R)$(raddbdir)/certs/demoCA; \