New build path variable

[freeradius.git] / Makefile

diff --git a/Makefile b/Makefile
index c2119a9..e8e37bc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ include Make.inc
 
 .PHONY: all clean install
 
-SUBDIRS                = $(LTDL_SUBDIRS) src raddb scripts doc
+SUBDIRS                = $(LTDL_SUBDIRS) $(wildcard src raddb scripts doc)
 WHAT_TO_MAKE   = all
 
 all:
@@ -77,17 +77,24 @@ install-chown:
        chmod u=rw,g=r,o=    `find $(R)$(raddbdir) -type f -print`
        chown -R $(RADMIN)   $(R)$(logdir)
        chgrp -R $(RGROUP)   $(R)$(logdir)
-       chmod u=rwx,g=rwx,o= `find $(R)$(logdir) -type d -print`
-       chmod g+s            `find $(R)$(logdir) -type d -print`
-       chmod u=rw,g=rw,o=   `find $(R)$(logdir) -type f -print`
+       find $(R)$(logdir) -type d -exec chmod u=rwx,g=rwx,o= {} \;
+       find $(R)$(logdir) -type d -exec chmod g+s {} \;
+       find $(R)$(logdir) -type f -exec chmod u=rw,g=rw,o= {} \;
+       chown -R $(RADMIN)   $(R)$(RUNDIR)
+       chgrp -R $(RGROUP)   $(R)$(RUNDIR)
+       find $(R)$(RUNDIR) -type d -exec chmod u=rwx,g=rwx,o= {} \;
+       find $(R)$(RUNDIR) -type d -exec chmod g+s {} \;
+       find $(R)$(RUNDIR) -type f -exec chmod u=rw,g=rw,o= {} \;
 endif
 endif
 
-common:
-       @for dir in $(SUBDIRS); do \
-               echo "Making $(WHAT_TO_MAKE) in $$dir..."; \
-               $(MAKE) $(MFLAGS) -C $$dir $(WHAT_TO_MAKE) || exit $$?; \
-       done
+.PHONY: common $(SUBDIRS)
+
+common: $(SUBDIRS)
+
+$(SUBDIRS):
+       @echo "Making $(WHAT_TO_MAKE) in $@..."
+       @$(MAKE) $(MFLAGS) -C $@ $(WHAT_TO_MAKE)
 
 distclean: clean
        rm -f config.cache config.log config.status libtool \
@@ -108,6 +115,7 @@ distclean: clean
 #
 ######################################################################
 reconfig: configure src/include/autoconf.h.in
+       @$(MAKE) $(MFLAGS) -C src reconfig
 
 configure: configure.in aclocal.m4
        $(AUTOCONF)
@@ -149,18 +157,14 @@ certs:
 #  BEFORE running this command!
 #
 ######################################################################
-freeradius-server-$(RADIUSD_VERSION): CVS
-       @CVSROOT=`cat CVS/Root`; \
-       cvs -d $$CVSROOT checkout -P -d freeradius-server-$(RADIUSD_VERSION) radiusd
-
-freeradius-server-$(RADIUSD_VERSION).tar.gz: freeradius-server-$(RADIUSD_VERSION)
-       @tar --exclude=CVS -zcf  $@ $<
+freeradius-server-$(RADIUSD_VERSION).tar.gz: .git
+       git archive --format=tar --prefix=freeradius-server-$(RADIUSD_VERSION)/ stable | gzip > $@
 
 freeradius-server-$(RADIUSD_VERSION).tar.gz.sig: freeradius-server-$(RADIUSD_VERSION).tar.gz
        gpg --default-key aland@freeradius.org -b $<
 
-freeradius-server-$(RADIUSD_VERSION).tar.bz2: freeradius-server-$(RADIUSD_VERSION)
-       @tar --exclude=CVS -jcf $@ $<
+freeradius-server-$(RADIUSD_VERSION).tar.bz2: .git
+       git archive --format=tar --prefix=freeradius-server-$(RADIUSD_VERSION)/ stable | bzip2 > $@
 
 freeradius-server-$(RADIUSD_VERSION).tar.bz2.sig: freeradius-server-$(RADIUSD_VERSION).tar.bz2
        gpg --default-key aland@freeradius.org -b $<
@@ -169,10 +173,14 @@ freeradius-server-$(RADIUSD_VERSION).tar.bz2.sig: freeradius-server-$(RADIUSD_VE
 .PHONY: dist-check
 dist-check: redhat/freeradius.spec suse/freeradius.spec debian/changelog
        @if [ `grep ^Version: redhat/freeradius.spec | sed 's/.*://;s/ //'` != "$(RADIUSD_VERSION)" ]; then \
+               cat redhat/freeradius.spec | sed 's/^Version: .*/Version: $(RADIUSD_VERSION)/' > redhat/.foo; \
+               mv redhat/.foo redhat/freeradius.spec; \
                echo redhat/freeradius.spec 'Version' needs to be updated; \
                exit 1; \
        fi
        @if [ `grep ^Version: suse/freeradius.spec | sed 's/.*://;s/ //'` != "$(RADIUSD_VERSION)" ]; then \
+               cat suse/freeradius.spec | sed 's/^Version: .*/Version: $(RADIUSD_VERSION)/' > suse/.foo; \
+               mv suse/.foo suse/freeradius.spec; \
                echo suse/freeradius.spec 'Version' needs to be updated; \
                exit 1; \
        fi
@@ -186,14 +194,15 @@ dist: dist-check freeradius-server-$(RADIUSD_VERSION).tar.gz freeradius-server-$
 dist-sign: freeradius-server-$(RADIUSD_VERSION).tar.gz.sig freeradius-server-$(RADIUSD_VERSION).tar.bz2.sig
 
 dist-publish: freeradius-server-$(RADIUSD_VERSION).tar.gz.sig freeradius-server-$(RADIUSD_VERSION).tar.gz freeradius-server-$(RADIUSD_VERSION).tar.gz.sig freeradius-server-$(RADIUSD_VERSION).tar.bz2 freeradius-server-$(RADIUSD_VERSION).tar.gz.sig freeradius-server-$(RADIUSD_VERSION).tar.bz2.sig
-       scp $^ freeradius.org@freeradius.org:public_ftp
+       scp $^ freeradius.org@ns5.freeradius.org:public_ftp
+       scp $^ freeradius.org@www.tr.freeradius.org:public_ftp
 
 #
 #  Note that we do NOT do the tagging here!  We just print out what
 #  to do!
 #
 dist-tag: freeradius-server-$(RADIUSD_VERSION).tar.gz freeradius-server-$(RADIUSD_VERSION).tar.bz2
-       @echo "cd freeradius-server-$(RADIUSD_VERSION) && cvs tag release_`echo $(RADIUSD_VERSION) | tr .- __` && cd .."
+       @echo "git tag release_`echo $(RADIUSD_VERSION) | tr .- __`"
 
 #
 #      Build a debian package