From 657e1ca0daf5e210335561a046cbdef378768684 Mon Sep 17 00:00:00 2001
From: aland <aland>
Date: Thu, 23 Jan 2003 20:02:20 +0000
Subject: [PATCH] 	Make 'datadir' point to '.../share/freeradius',
 instead of 	adding 'freeradius' on elsewhere.  This makes the config a
 little 	more consistent.

---
 Make.inc.in           |  2 +-
 Makefile              | 11 +++++------
 raddb/radiusd.conf.in |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Make.inc.in b/Make.inc.in
index 722a95e..876f98e 100644
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -13,7 +13,7 @@ libdir		= @libdir@
 bindir		= @bindir@
 sbindir		= @sbindir@
 mandir		= @mandir@
-datadir		= @datadir@
+datadir		= @datadir@/freeradius
 logdir		= @logdir@
 raddbdir	= @raddbdir@
 radacctdir	= @radacctdir@
diff --git a/Makefile b/Makefile
index 22fe4c1..4d8b65c 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,6 @@ install:
 	$(INSTALL) -d -m 700	$(R)$(logdir)
 	$(INSTALL) -d -m 700	$(R)$(radacctdir)
 	$(INSTALL) -d -m 700	$(R)$(datadir)
-	$(INSTALL) -d -m 700	$(R)$(datadir)/freeradius
 	@$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
 	for i in 1 5 8; do \
 		$(INSTALL) -d -m 755	$(R)$(mandir)/man$$i; \
@@ -45,12 +44,12 @@ install:
                 $(INSTALL) -m 644 $$i $(R)$(raddbdir); \
 	done; \
 	chmod 600 $(R)$(raddbdir)/naspasswd $(R)$(raddbdir)/clients $(R)$(raddbdir)/clients.conf;
-	@echo "Creating/updating files in $(R)$(datadir)/freeradius"; \
+	@echo "Creating/updating files in $(R)$(datadir)"; \
 	cd share; \
 	for i in dictionary*; do \
-		[ ! -f $(R)$(datadir)/freeradius/$$i ] && $(INSTALL) -m 644 $$i $(R)$(datadir)/freeradius; \
-		if [ "`find $$i -newer $(R)$(datadir)/freeradius/$$i`" ]; then \
-			echo "** $(R)$(datadir)/freeradius/$$i"; \
+		[ ! -f $(R)$(datadir)/$$i ] && $(INSTALL) -m 644 $$i $(R)$(datadir); \
+		if [ "`find $$i -newer $(R)$(datadir)/$$i`" ]; then \
+			echo "** $(R)$(datadir)/$$i"; \
 			nt=1; \
 		fi; \
 	done; \
@@ -60,7 +59,7 @@ install:
 		echo "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **";\
 		echo "**";\
 		echo "** The sample configuration files in `pwd`";\
-		echo "** are newer than those in $(R)$(datadir)/freeradius";\
+		echo "** are newer than those in $(R)$(datadir)";\
 		echo "**";\
 		echo "** Please investigate and manually copy (if appropriate) the files listed above.";\
 		echo "**";\
diff --git a/raddb/radiusd.conf.in b/raddb/radiusd.conf.in
index b9b2b69..2ec34a1 100644
--- a/raddb/radiusd.conf.in
+++ b/raddb/radiusd.conf.in
@@ -28,7 +28,7 @@ sbindir = @sbindir@
 logdir = @logdir@
 raddbdir = @raddbdir@
 radacctdir = @radacctdir@
-datadir = @datadir@
+datadir = @datadir@/freeradius
 
 #  Location of config and logfiles.
 confdir = ${raddbdir}
-- 
2.1.4