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 261d5d6..9f780aa 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -61,9 +61,8 @@ endif
 
 include /usr/share/quilt/quilt.make
 
-config.status: configure
+config.status: patch configure
        dh_testdir
-       dh_testroot
 
 ifeq (config.sub.dist,$(wildcard config.sub.dist))
        rm config.sub
@@ -78,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 \
@@ -108,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 patch
+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 $@
 
@@ -153,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