- fix default dictionary file

This commit is contained in:
Dirk Meyer 2013-12-01 05:42:35 +00:00
parent af968666dc
commit be00cf6845
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=335365
2 changed files with 12 additions and 5 deletions

View File

@ -9,7 +9,7 @@
SERVER_OBJS = radiusd.o files.o acct.o pam.o version.o proxy.o \
exec.o auth.o timestr.o cache.o readusers.o
@@ -115,36 +115,36 @@
@@ -115,35 +115,35 @@
install:
# Install the binaries
@ -62,6 +62,4 @@
+ [ ! -f $(RADIUS_DIR)/$$i ] && cp $$i $(DESTROOT)$(RADIUS_DIR)/$$i.sample; \
done; true
@# Install the dictionary files
- @sh dict-install.sh ../raddb $(RADIUS_DIR) $(SHAREDIR)
+ @sh dict-install.sh ../raddb $(RADIUS_DIR) $(DESTROOT)$(SHAREDIR)
@sh dict-install.sh ../raddb $(RADIUS_DIR) $(SHAREDIR)

View File

@ -1,5 +1,14 @@
--- src/dict-install.sh.orig 2003-04-10 16:17:11.000000000 +0200
+++ src/dict-install.sh 2013-11-17 09:11:22.000000000 +0100
+++ src/dict-install.sh 2013-12-01 06:23:00.000000000 +0100
@@ -31,7 +31,7 @@
if [ $NEWTYPE = yes ]
then
- DESTDIR=$SHAREDIR
+ DESTDIR=$DESTROOT$SHAREDIR
else
DESTDIR=$RADDBDIR
fi
@@ -41,9 +41,9 @@
mkdir -p $DESTDIR
fi