import from branch_1_1:

[freeradius.git] / Makefile

diff --git a/Makefile b/Makefile
index 22fe4c1..21709e8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ include Make.inc
 
 .PHONY: all clean install
 
-SUBDIRS                = ${LIBLTDLPATH} src raddb scripts
+SUBDIRS                = $(LTDL_SUBDIRS) src raddb scripts doc
 WHAT_TO_MAKE   = all
 
 all:
@@ -21,6 +21,24 @@ clean:
        @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
        @rm -f *~
 
+#
+# The $(R) is a magic variable not defined anywhere in this source.
+# It's purpose is to allow an admin to create an installation 'tar'
+# file *without* actually installing it.  e.g.:
+#
+#  $ R=/home/root/tmp make install
+#  $ cd /home/root/tmp
+#  $ tar -cf ~/freeradius-package.tar *
+#
+# The 'tar' file can then be un-tar'd on any similar machine.  It's a
+# cheap way of creating packages, without using a package manager.
+# Many of the platform-specific packaging tools use the $(R) variable
+# when creating their packages.
+#
+# For compatibility with typical GNU packages (e.g. as seen in libltdl),
+# we make sure DESTDIR is defined.
+#
+export DESTDIR := $(R)
 install:
        $(INSTALL) -d -m 755    $(R)$(sbindir)
        $(INSTALL) -d -m 755    $(R)$(bindir)
@@ -29,49 +47,26 @@ install:
        $(INSTALL) -d -m 755    $(R)$(RUNDIR)
        $(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
+       $(INSTALL) -d -m 755    $(R)$(datadir)
+       $(INSTALL) -d -m 755    $(R)$(dictdir)
        for i in 1 5 8; do \
                $(INSTALL) -d -m 755    $(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)"; \
-       cd raddb; \
-       for i in [a-c]* [e-z]*; do \
-               [ $$i != radiusd.conf.in -a ! -f $(R)$(raddbdir)/$$i ] && \
-                $(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"; \
+       @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
+       @echo "Installing dictionary files in $(R)$(dictdir)"; \
        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"; \
-                       nt=1; \
-               fi; \
-       done; \
-       if [ "$$nt" ]; then \
-               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)$(datadir)/freeradius";\
-               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
+               $(INSTALL) -m 644 $$i $(R)$(dictdir); \
+       done
+       $(LIBTOOL) --finish $(R)$(libdir)
 
 common:
        @for dir in $(SUBDIRS); do \
                echo "Making $(WHAT_TO_MAKE) in $$dir..."; \
-               (cd $$dir && $(MAKE) $(MFLAGS) $(WHAT_TO_MAKE)) || exit 1;\
+               $(MAKE) $(MFLAGS) -C $$dir $(WHAT_TO_MAKE) || exit $$?; \
        done
 
 distclean: clean
@@ -111,3 +106,10 @@ config.status: configure
        ./config.status --recheck
 
 configure.in:
+
+.PHONY: check-includes
+check-includes:
+       scripts/min-includes.pl `find . -name "*.c" -print`
+
+TAGS:
+       etags `find src -type f -name '*.[ch]' -print`