Merge remote-tracking branch 'remotes/origin/moonshot-fr-3.0.12-upgrade' into debian

[freeradius.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 97016e3..9f780aa 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,9 @@
 
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/default.mk
+
 
 .NOTPARALLEL:
 
@@ -26,7 +29,7 @@ logdir          = /var/log/$(package)
 pkgdocdir       = /usr/share/doc/$(package)
 raddbdir        = /etc/$(package)
 
-modulelist=krb5 ldap sql_mysql sql_iodbc sql_postgresql dhcp
+modulelist=krb5 ldap sql_mysql sql_iodbc sql_postgresql dhcp redis rest yubikey
 pkgs=$(shell dh_listpackages)
 
 # This has to be exported to make some magic below work.
@@ -58,7 +61,7 @@ endif
 
 include /usr/share/quilt/quilt.make
 
-config.status: configure
+config.status: patch configure
        dh_testdir
 
 ifeq (config.sub.dist,$(wildcard config.sub.dist))
@@ -74,7 +77,6 @@ endif
        ln -s /usr/share/misc/config.sub config.sub
        ln -s /usr/share/misc/config.guess config.guess
 
-
        ./configure $(confflags) \
                --config-cache \
                --disable-developer \
@@ -93,6 +95,7 @@ endif
                --without-rlm_eap_tnc \
                --with-rlm_sql_postgresql_lib_dir=`pg_config --libdir` \
                --with-rlm_sql_postgresql_include_dir=`pg_config --includedir` \
+               --with-iodbc-include-dir='/usr/include/iodbc' \
                --without-rlm_eap_ikev2 \
                --without-rlm_sql_oracle \
                --without-rlm_sql_unixodbc
@@ -103,14 +106,14 @@ endif
        mv config.sub.dist config.sub
 
 #Architecture
-build: patch build-arch build-indep
+build: build-arch build-indep
 
-build-arch: build-arch-stamp
+build-arch: patch build-arch-stamp
 build-arch-stamp: config.status
        $(MAKE)
        touch $@
 
-build-indep: build-indep-stamp
+build-indep: patch build-indep-stamp
 build-indep-stamp: config.status
        touch $@
 
@@ -148,6 +151,7 @@ install-arch: build-arch-stamp
        ln -fs rlm_sql.so $(freeradius_dir)/usr/lib/freeradius/librlm_sql.so
        $(MAKE) install R=$(freeradius_dir) PACKAGE='debian'
 
+
        # 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
@@ -163,6 +167,9 @@ install-arch: build-arch-stamp
          rm -f $(freeradius_dir)/usr/lib/freeradius/rlm_$$mod*.so ; \
        done
 
+       dh_install --sourcedir=$(freeradius_dir) -p freeradius-memcached
+       rm -f $(freeradius_dir)/usr/lib/freeradius/rlm_cache_memcached.so
+
        dh_install --sourcedir=$(freeradius_dir) -p freeradius-utils
        dh_install --sourcedir=$(freeradius_dir) -p freeradius