New build path variable

[freeradius.git] / raddb / Makefile

diff --git a/raddb/Makefile b/raddb/Makefile
index 3382f2b..01d3f03 100644 (file)
--- a/raddb/Makefile
+++ b/raddb/Makefile
@@ -9,13 +9,11 @@ include ../Make.inc
 #
 #  The list of files to install.
 #
-FILES = acct_users attrs attrs.access_reject attrs.accounting_response \
-       attrs.pre-proxy clients.conf dictionary \
-       eap.conf experimental.conf hints huntgroups ldap.attrmap        \
-        naspasswd otp.conf     \
-       preproxy_users proxy.conf radiusd.conf radrelay.conf            \
-       realms snmp.conf sql.conf sqlippool.conf users vmpsd.conf \
-       sites-available/default
+FILES = acct_users attrs attrs.access_reject attrs.accounting_response \
+       attrs.pre-proxy clients.conf dictionary eap.conf templates.conf \
+       experimental.conf hints huntgroups ldap.attrmap                 \
+       policy.txt preproxy_users proxy.conf radiusd.conf               \
+       sql.conf sqlippool.conf users   policy.conf attrs.access_challenge
 
 #
 #      This target is here for local debugging
@@ -24,14 +22,20 @@ all:
        @if [ ! -d sites-enabled ]; then \
                mkdir sites-enabled; \
        fi
-       @cd sites-enabled && ln -s ../sites-available/default
+       @if [ ! -f sites-enabled/default ]; then \
+               cd sites-enabled && ln -s ../sites-available/default; \
+       fi
+       @if [ ! -f sites-enabled/inner-tunnel ]; then \
+               cd sites-enabled && ln -s ../sites-available/inner-tunnel; \
+       fi
 
 install:
        $(INSTALL) -d -m 750    $(R)$(raddbdir)
-       $(INSTALL) -d -m 750    $(R)$(raddbdir)/sites-evailable
+       $(INSTALL) -d -m 750    $(R)$(raddbdir)/sites-available
        $(INSTALL) -d -m 750    $(R)$(raddbdir)/sites-enabled
+       $(INSTALL) -d -m 750    $(R)$(raddbdir)/modules
        @echo "Creating/updating files in $(R)$(raddbdir)"; \
-       for i in $(FILES); do \
+       for i in $(FILES) `find sites-available/ modules/ -type f -print | sed 's/.*CVS.*//;s/.*~//;s/.*#.*//' `; do \
                [ ! -f $(R)$(raddbdir)/$$i ] && $(INSTALL) -m 640 $$i $(R)$(raddbdir)/$$i; \
                if [ "`find $$i -newer $(R)$(raddbdir)/$$i`" ]; then \
                        echo "** $(R)$(raddbdir)/$$i"; \
@@ -51,7 +55,7 @@ install:
                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.conf
+       chmod 640 $(R)$(raddbdir)/clients.conf
        if [ ! -d $(R)$(raddbdir)/certs ]; then \
                $(INSTALL) -d -m 750    $(R)$(raddbdir)/certs; \
                $(INSTALL) -m 750 certs/bootstrap $(R)$(raddbdir)/certs; \
@@ -60,12 +64,27 @@ install:
                done; \
        fi
        if [ ! -d $(R)$(raddbdir)/sql ]; then \
-               mkdir $(R)$(raddbdir)/sql; \
-               cp sql/*conf $(R)$(raddbdir)/sql 2>/dev/null || true; \
+               find sql -name CVS -prune -o -print | \
+                 while read file; do \
+                   if [ -d "$$file" ]; then \
+                     $(INSTALL) -d -m 750 "$(R)$(raddbdir)/$$file"; \
+                   else \
+                     $(INSTALL) -m 640 "$$file" "$(R)$(raddbdir)/$$file"; \
+                   fi; \
+                 done; \
        fi
        if [ ! -f $(R)$(raddbdir)/sites-enabled/default ]; then \
                cd $(R)$(raddbdir)/sites-enabled/; \
                ln -s ../sites-available/default; \
        fi
+       if [ ! -f $(R)$(raddbdir)/sites-enabled/inner-tunnel ]; then \
+               cd $(R)$(raddbdir)/sites-enabled/; \
+               ln -s ../sites-available/inner-tunnel; \
+       fi
+       if [ ! -f $(R)$(raddbdir)/sites-enabled/control-socket ]; then \
+               cd $(R)$(raddbdir)/sites-enabled/; \
+               ln -s ../sites-available/control-socket; \
+       fi
 
 clean:
+       rm -rf sites-enabled/inner-tunnel sites-enabled/default