Rewrite large parts of the Makefile based on the changes from the
authornbk <nbk>
Mon, 20 Aug 2007 14:47:21 +0000 (14:47 +0000)
committernbk <nbk>
Mon, 20 Aug 2007 14:47:21 +0000 (14:47 +0000)
downstream debian package. (use dpatches and debhelper files where
possible)

Also add the possibility to make binary-distributable packages
by writing "openssl = no" at the beginning of the file.

debian/rules

index cd0eaef..337e001 100755 (executable)
@@ -5,11 +5,10 @@
 
 .NOTPARALLEL:
 
-SHELL          =/bin/bash
+SHELL          = /bin/bash
 
 package                = freeradius
-debiandir      = $(shell pwd)/debian
-freeradius_dir = $(debiandir)/$(package)
+freeradius_dir = $(CURDIR)/debian/tmp
 
 mandir         = /usr/share/man
 libdir         = /usr/lib/$(package)
@@ -17,13 +16,13 @@ logdir              = /var/log/$(package)
 pkgdocdir      = /usr/share/doc/$(package)
 raddbdir       = /etc/$(package)
 
-# All supported modules, irrespective of licensing
-modulepackages = krb5 ldap mysql iodbc postgresql
-buildssl = --with-rlm_sql_postgresql_lib_dir=`pg_config --libdir` --with-rlm_sql_postgresql_include_dir=`pg_config --includedir`
+# Use "openssl=no" below to build a binary-distributable version
+# for the Debian archive.
+openssl = yes
 
-# Binary-distributable modules for the Debian archive.
-#modulepackages = krb5 ldap mysql iodbc
-#buildssl = --without-rlm_eap_peap --without-rlm_eap_tls --without-rlm_eap_ttls --without-rlm_otp --without-rlm_sql_postgresql --without-snmp
+include /usr/share/dpatch/dpatch.make
+
+modulelist=krb5 ldap sql_mysql sql_iodbc sql_postgresql
 
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -43,10 +42,20 @@ else
        confflags += --host $(DEB_BUILD_GNU_TYPE) --build $(DEB_HOST_GNU_TYPE)
 endif
 
-build-simple: stamp-build
-stamp-build: stamp-patch
+ifeq ($(openssl), no)
+        confflags += --without-openssl --without-rlm_eap_peap --without-rlm_eap_tls --without-rlm_eap_ttls --without-rlm_otp
+endif
+
+configure-stamp: patch-stamp
        dh_testdir
-       # dh_testroot
+
+       # Update the autotools files if necessary
+       # Force Build-Depends on autotools-dev for /usr/share/misc/config.*
+       if [ -e config.sub.dist ]; then rm config.sub; else mv config.sub config.sub.dist; fi
+       if [ -e config.guess.dist ]; then rm config.guess; else mv config.guess config.guess.dist; fi
+       ln -s /usr/share/misc/config.sub config.sub
+       ln -s /usr/share/misc/config.guess config.guess
+
        ./configure \
                $(confflags) \
                --config-cache \
@@ -63,179 +72,128 @@ stamp-build: stamp-patch
                --with-large-files --with-udpfromto --with-edir \
                --enable-strict-dependencies \
                --enable-developer \
-               ${buildssl}
+               --with-rlm-sql-postgresql-lib-dir=`pg_config --libdir` \
+               --with-rlm-sql-postgresql-include-dir=`pg_config --includedir`
+
+       touch configure-stamp
 
-       # Modify Make.inc for Debian...
-       TEMPFILE=`mktemp /tmp/radmake-XXXXXX`; \
-       cp Make.inc $$TEMPFILE; \
-       cat $$TEMPFILE \
-               | sed -e 's!${localstatedir}/run/radiusd!${localstatedir}/run/freeradius!' \
-                       > Make.inc; \
-       rm $$TEMPFILE
+build: build-arch build-indep
 
-       make
-       touch stamp-build
+build-indep: patch build-indep-stamp
+build-indep-stamp: configure-stamp
+       touch build-indep-stamp
 
-build: autotools build-simple
+build-arch: build-arch-stamp
+build-arch-stamp: configure-stamp
+       $(MAKE)
+       touch build-arch-stamp
 
-binary-indep: stamp-build
+install: install-arch install-indep
+
+install-indep: install-indep-stamp
+install-indep-stamp: build-indep-stamp
+       dh_testdir
        dh_testroot
-       dh_clean -i -k
-       dh_installdirs -i
-       # Dialup-Admin
-       dh_installdocs -p freeradius-dialupadmin -XCVS
-       dh_installchangelogs -p freeradius-dialupadmin dialup_admin/Changelog
-       dh_installexamples -p freeradius-dialupadmin
-       dh_install -p freeradius-dialupadmin -XCVS dialup_admin/conf/* etc/freeradius-dialupadmin/
-       dh_install -p freeradius-dialupadmin -XCVS -XChangelog -XREADME -Xconf/ -Xdoc/ -Xdialup_admin.cron dialup_admin/* usr/share/freeradius-dialupadmin/
-       dh_link -p freeradius-dialupadmin
-       dh_perl -p freeradius-dialupadmin dialup_admin/bin/*
-# Fix the crontab example to point to the right directory
-       cat $(freeradius_dir)-dialupadmin/usr/share/doc/freeradius-dialupadmin/examples/dialup_admin.cron \
-               | sed -e 's#/usr/local/dialup_admin#/usr/share/freeradius-dialupadmin#' \
-               > $(freeradius_dir)-dialupadmin/usr/share/doc/freeradius-dialupadmin/examples/freeradius-dialupadmin.cron
-       rm $(freeradius_dir)-dialupadmin/usr/share/doc/freeradius-dialupadmin/examples/dialup_admin.cron
-       TEMPFILE=`mktemp /tmp/dialupconf-XXXXXX`; \
-       cp $(freeradius_dir)-dialupadmin/etc/freeradius-dialupadmin/admin.conf $$TEMPFILE; \
-       cat $$TEMPFILE \
-               | sed -e 's#/usr/local/dialup_admin#/usr/share/freeradius-dialupadmin#' \
-                       -e 's#/usr/local/radiusd#/usr#' \
-                       -e 's#general_raddb_dir: %{general_radiusd_base_dir}/etc/raddb#general_raddb_dir: /etc/freeradius#' \
-                       -e 's#general_clients_conf: /usr/local/etc/raddb/clients.conf#general_clients_conf: /etc/freeradius/clients.conf#' \
-                       -e 's#%{general_base_dir}/conf#/etc/freeradius-dialupadmin#' \
-                       -e 's#/usr/local/bin#/usr/bin#' \
-               > $(freeradius_dir)-dialupadmin/etc/freeradius-dialupadmin/admin.conf; \
-       rm $$TEMPFILE;
-       TEMPFILE=`mktemp /tmp/dialuphelp-XXXXXX`; \
-       cp $(freeradius_dir)-dialupadmin/usr/share/freeradius-dialupadmin/htdocs/help/help.php3 $$TEMPFILE; \
-       cat $$TEMPFILE \
-               | sed -e 's#readfile#readgzfile#' \
-                       -e 's#../../README#/usr/share/doc/freeradius-dialupadmin/README.gz#' \
-                       -e 's#../../doc/HOWTO#/usr/share/doc/freeradius-dialupadmin/HOWTO.gz#' \
-                       -e 's#../../doc/FAQ#/usr/share/doc/freeradius-dialupadmin/FAQ#' \
-               > $(freeradius_dir)-dialupadmin/usr/share/freeradius-dialupadmin/htdocs/help/help.php3; \
-       rm $$TEMPFILE;
-       for binfile in $(freeradius_dir)-dialupadmin/usr/share/freeradius-dialupadmin/bin/*; do \
-               TEMPFILE=`mktemp /tmp/dialupbin-XXXXXX`; \
-               cp $$binfile $$TEMPFILE; \
-               cat $$TEMPFILE \
-                       | sed -e 's#/usr/local/bin/#/usr/bin/#' \
-                               -e 's#/usr/local/dialup_admin/conf/#/etc/freeradius-dialupadmin/#' \
-                       > $$binfile; \
-               rm $$TEMPFILE; \
-       done
 
-       # bonus scipts
-       dh_installdeb -i
-       dh_compress -i
-       dh_fixperms -i
-       dh_md5sums -i
-       dh_gencontrol -i
-       dh_builddeb -i
+       $(MAKE) -C dialup_admin DIALUP_PREFIX=/usr/share/freeradius-dialupadmin \
+                               DIALUP_DOCDIR=/usr/share/doc/freeradius-dialupadmin \
+                               DIALUP_CONFDIR=/etc/freeradius-dialupadmin \
+                               R=$(freeradius_dir) install
+       mv $(freeradius_dir)/usr/share/freeradius-dialupadmin/bin/dialup_admin.cron \
+          $(freeradius_dir)/usr/share/freeradius-dialupadmin/bin/freeradius-dialupadmin.cron
+
+       touch install-indep-stamp
 
-binary-arch: stamp-build
+install-arch: install-arch-stamp
+install-arch-stamp: build-arch-stamp
+       dh_testdir
        dh_testroot
-       dh_clean -s -k
-       dh_installdirs -s
-       make install R=$(freeradius_dir)
 
-       # rename radius binary to play nicely with others
+       $(MAKE) install R=$(freeradius_dir)
+
+       # Rename radius binary to play nicely with others
        mv $(freeradius_dir)/usr/sbin/radiusd $(freeradius_dir)/usr/sbin/$(package)
+       mv $(freeradius_dir)/$(mandir)/man8/radiusd.8 $(freeradius_dir)/$(mandir)/man8/$(package).8
 
-       # clean up install cruft.  $$&@!%
-       rm $(freeradius_dir)/usr/sbin/rc.radiusd
-       test ! -d $(freeradius_dir)/etc/raddb || rmdir $(freeradius_dir)/etc/raddb
-       test ! -d $(freeradius_dir)/var/log/radius/radacct || rmdir $(freeradius_dir)/var/log/radius/radacct
-       test ! -d $(freeradius_dir)/var/log/radius || rmdir $(freeradius_dir)/var/log/radius
-#      this is from the Makefile in doc/
-       rm -f $(freeradius_dir)/usr/share/doc/freeradius/ChangeLog
-#      and this one from the Makefile in src/modules/rlm_perl
+       # Clean up after install
        rm -f $(freeradius_dir)/etc/freeradius/example.pl
+       rm -f $(freeradius_dir)/usr/sbin/rc.radiusd
+       rm -f $(freeradius_dir)/usr/share/doc/freeradius/ChangeLog
 
-       # split out inconvenient/controversal modules to other places
-       for modname in $(modulepackages); do \
-               mkdir -p $(debiandir)/$(package)-$${modname}/$(libdir); \
-               mv $(freeradius_dir)/$(libdir)/rlm*_$${modname}* $(debiandir)/$(package)-$${modname}/$(libdir)/; \
-       done
+       # Install the SNMP MIBs into debian/tmp
+       install -m 755 -d $(freeradius_dir)/usr/share/snmp/mibs
+       install -m 644 mibs/*.txt $(freeradius_dir)/usr/share/snmp/mibs
 
-       # man pages & docs
-       dh_installdocs
-       install -g root -m 644 CREDITS $(freeradius_dir)/$(pkgdocdir)/credits
-       dh_installexamples -XCVS -XMakefile -X\\.in src/modules/rlm_perl/example.pl
-       dh_installchangelogs doc/ChangeLog
+       touch install-arch-stamp
 
-       #Rename manpage to go with binary
-       mv $(freeradius_dir)/$(mandir)/man8/radiusd.8 $(freeradius_dir)/$(mandir)/man8/$(package).8
+binary: binary-indep binary-arch
 
-       # SNMP mibs
-       install -g root -m 644 mibs/*.txt $(freeradius_dir)/usr/share/snmp/mibs
-
-       # supporting programs
-       TEMPFILE=`mktemp /tmp/radconf-XXXXXX`; \
-       cp $(freeradius_dir)/$(raddbdir)/radiusd.conf $$TEMPFILE; \
-       cat $$TEMPFILE \
-               | sed -e 's/        /   /g' \
-                       -e '/^  example {/,/^   }/s/^/#/' \
-                       -e 's/# shadow = /shadow = /' \
-                       -e 's/^#\?group = nobody/group = freerad/' \
-                       -e 's/^#\?user = nobody/user = freerad/' \
-                       -e 's!/run/radiusd!/run/freeradius!' \
-                       -e 's!radiusd.pid!freeradius.pid!' \
-                       > $(freeradius_dir)/$(raddbdir)/radiusd.conf; \
-       rm $$TEMPFILE
-
-       # bonus scipts
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-       dh_strip -s
-endif
-       dh_installlogrotate -s
-       dh_installinit -n -s
-       dh_installpam --name=radiusd -s
+binary-indep: install-indep-stamp
+       dh_testroot
+       #dh_clean -i -k
+       dh_installdirs -i
+       dh_install -XCVS -X.svn -i --sourcedir=debian/tmp
+       dh_installdocs -XCVS -X.svn -i
+       dh_installchangelogs -XCVS -X.svn dialup_admin/Changelog -i
+       dh_installexamples -XCVS -X.svn -i
+       dh_installman -XCVS -X.svn -i
+       dh_link -i
+       dh_perl -i
+       dh_installdeb -i
+       dh_compress -i
+       dh_fixperms -i
+       dh_md5sums -i
+       dh_gencontrol -i
+       dh_builddeb -i
+
+binary-arch: install-arch-stamp
+       dh_testroot
+       #dh_clean -a -k
+       dh_installdirs -a
+       dh_install -XCVS -X.svn -a --sourcedir=debian/tmp
+       # Not nice, but it works; remove modules we package seperately
+       # from the main package
+       for mod in ${modulelist}; do \
+               rm -f $(CURDIR)/debian/freeradius/usr/lib/freeradius/rlm_$$mod* ; \
+       done
+       dh_installdocs -XCVS -X.svn -a
+       dh_installexamples -XCVS -X.svn -a
+       dh_installchangelogs -XCVS -X.svn -a doc/ChangeLog
+       dh_installman -XCVS -X.svn -a
+       dh_strip -a --dbg-package=freeradius-dbg
+       dh_installlogrotate -a
+       dh_installinit -n -a
+       dh_installpam --name=radiusd -a
        # We don't need ldconfig. None of our libraries go in it's paths
-       dh_makeshlibs -n -s
-       dh_shlibdeps -s
-       dh_installdeb -s
-       dh_compress -s
-       dh_fixperms -s
-       dh_md5sums -s
-       dh_gencontrol -s
-       dh_builddeb -s
-
-clean: clean-patched unpatch
-
-clean-patched:
+       dh_makeshlibs -n -a
+       dh_shlibdeps -a
+ifeq ($(openssl), no)
+       for pkg in $(shell grep ^Package debian/control | awk '{print $$2}') ; do \
+               if dh_shlibdeps -p $$pkg -- -O | grep -q libssl; then \
+                       echo "$$pkg links to openssl" ; \
+                       exit 1 ; \
+               fi ; \
+       done
+endif
+       dh_installdeb -a
+       dh_compress -a
+       dh_fixperms -a
+       dh_md5sums -a
+       dh_gencontrol -a
+       dh_builddeb -a
+
+clean: unpatch
        dh_testdir
-       rm -f stamp-build debian/{files,substvars} debian/*.debhelper libltdl/stamp-h1
-       [ -f Make.inc ] && make distclean || true
        dh_clean
-       rm -rf $(freeradius_dir)
-       rm -rf src/modules/lib/
-       for modname in $(modulepackages); do \
-               rm -rf $(debiandir)/$(package)-$${modname}{,.substvars}; \
-       done
-       [ -f config.sub.dist ] && rm config.sub && mv config.sub.dist config.sub || true
-       [ -f config.guess.dist ] && rm config.guess && mv config.guess.dist config.guess || true
-
-
-binary: binary-indep binary-arch
-
-# The autotools target adds forced build-time dependencies on
-# autotools-dev (for /usr/share/misc/config.*)
-# It's also a .PHONY make target.
-autotools:
-       if [ -e config.sub.dist ]; then rm config.sub; else mv config.sub config.sub.dist; fi
-       if [ -e config.guess.dist ]; then rm config.guess; else mv config.guess config.guess.dist; fi
-       ln -s /usr/share/misc/config.sub config.sub
-       ln -s /usr/share/misc/config.guess config.guess
+       rm -f build-arch-stamp build-indep-stamp libltdl/stamp-h1
+       rm -f install-arch-stamp install-indep-stamp configure-stamp
 
-patch: stamp-patch
-stamp-patch:
-       dpatch apply-all
-#      dpatch call-all -a=pkg-info > stamp-patch
-       dpatch list-all > stamp-patch
+       [ -f Make.inc ] && make distclean || true
+       # The make clean forgets to remove this build directory
+       [ -d src/modules/lib ] && rm -fr src/modules/lib || true
 
-unpatch:
-       dpatch deapply-all
-       rm -rf stamp-patch debian/patched
+       # Put the original autotools files back in place
+       [ -f config.sub.dist ] && rm config.sub && mv config.sub.dist config.sub || true
+       [ -f config.guess.dist ] && rm config.guess && mv config.guess.dist config.guess || true
 
-.PHONY: binary binary-arch binary-indep clean clean-patched autotools build build-simple patch unpatch
+.PHONY: build build-indep build-arch install install-indep install-arch binary binary-arch binary-indep clean