Make the installation directories BEFORE recursing over

	sub-directories.  This means that any module can safely install
	something into $(R)$(bindir), or $(R)$(raddbdir), and it will
	be installed in that directory.

	If we don't make the directories before calling the modules,
	then installing something into $(R)$(raddbdir) MAY create a normal
	file named '$(R)$(raddbdir)', and a subsequent 'mkdir' will fail.

diff --git a/Makefile b/Makefile
index 8be35fa..946af68 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,11 +20,14 @@ 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);
-       $(INSTALL) -d -m 755    $(R)$(RUNDIR);
-       $(INSTALL) -d -m 700    $(R)$(logdir);
-       $(INSTALL) -d -m 700    $(R)$(radacctdir);
        for i in 1 5 8; do \
                $(INSTALL) -d -m 755    $(R)$(mandir)/man$$i; \
                for p in man/man$$i/*.$$i; do \
@@ -32,7 +35,6 @@ install:
                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 ] && \

diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index b400110..988e0d5 100644 (file)
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -139,9 +139,7 @@ clean:
        rm -rf *.o *.so *~ $(BINARIES) .libs
 
 install:
-       $(INSTALL) -d -m 755                    $(R)$(sbindir)
        $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(INSTALLSTRIP) radiusd     $(R)$(sbindir)
-       $(INSTALL) -d -m 755                    $(R)$(bindir)
        $(INSTALL) -m 755 $(INSTALLSTRIP) radwho                $(R)$(bindir)
        $(INSTALL) -m 755 $(INSTALLSTRIP) raduse                $(R)$(bindir)
        $(INSTALL) -m 755 $(INSTALLSTRIP) radzap                $(R)$(bindir)