Make the installation directories BEFORE recursing over

[freeradius.git] / Makefile

diff --git a/Makefile b/Makefile
index f991a00..946af68 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# Makefile     Makefile for the cistron-radius package.
+# Makefile
 #
 #              NOTE: This top-level Makefile must not
 #              use GNU-make extensions. The lower ones can.
@@ -9,7 +9,7 @@
 
 include Make.inc
 
-SUBDIRS                = libltdl src raddb doc scripts
+SUBDIRS                = ${LIBLTDLPATH} src raddb scripts
 WHAT_TO_MAKE   = all
 
 all:
@@ -20,14 +20,21 @@ clean:
        @rm -f *~
 
 install:
+       $(INSTALL) -d -m 755    $(R)$(sbindir)
+       $(INSTALL) -d -m 755    $(R)$(bindir)
+       $(INSTALL) -d -m 755    $(R)$(raddbdir)
+       $(INSTALL) -d -m 755    $(R)$(mandir)
+       $(INSTALL) -d -m 755    $(R)$(RUNDIR)
+       $(INSTALL) -d -m 700    $(R)$(logdir)
+       $(INSTALL) -d -m 700    $(R)$(radacctdir)
        @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
-       $(INSTALL) -d -m 755    $(R)$(mandir);
        for i in 1 5 8; do \
                $(INSTALL) -d -m 755    $(R)$(mandir)/man$$i; \
-               $(INSTALL) -m 644 man/man$$i/*.$$i $(R)$(mandir)/man$$i; \
+               for p in man/man$$i/*.$$i; do \
+                       $(INSTALL) -m 644 $$p $(R)$(mandir)/man$$i; \
+               done \
        done
        @echo "Creating/updating files in $(R)$(raddbdir)"; \
-       $(INSTALL) -d -m 755    $(R)$(raddbdir); \
        cd raddb; \
        for i in [a-c]* [e-z]*; do \
                [ $$i != radiusd.conf.in -a ! -f $(R)$(raddbdir)/$$i ] && \
@@ -41,8 +48,17 @@ install:
                fi; \
        done; \
        if [ "$$nt" ]; then \
-               echo "** The samples in ../raddb are newer than these files";\
-               echo "** Please investigate and copy manually if appropriate";\
+               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
 
 common: