Make deprecated things not built by default by Makefile (and remove code in debian...

diff --git a/debian/changelog b/debian/changelog
index e62edb3935190c3b1e5013fe5b0c6b0249477444..fe7458332a8f54336050d140b93000edef637a64 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ userv-utils (0.6.0~~iwj3) unstable; urgency=low
   * Remove obsolete and broken dist target in root Makefile.
   * Add quirkafleeg to git-daemon/Makefile to placate emacs makefile mode.
   * www-cgi: Overhaul of env var handling (thanks to Mark Wooding).
+  * Make deprecated things not built by default by Makefile (and remove
+    code in debian/rules for achieving this).
 
  --
 

diff --git a/debian/rules b/debian/rules
index 2c604d862651734cb35d4498a95d78b0c90ac8ed..6c715d1f603e4675623cfa83e0ad17bad8b7c158 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,7 @@ override_dh_auto_configure:
 override_dh_auto_build:
        $(checkdir)
        set -e; for s in $(subdirs_build); do \
-               $(MAKE) -C $$s all depr=disable; \
+               $(MAKE) -C $$s all; \
        done
        touch build
 
@@ -53,7 +53,6 @@ override_dh_auto_install:
                        prefix=$$t/usr \
                        etcdir=$$t/etc \
                        vardir=$$t/var \
-                       depr=disable \
                        gituser=root \
                ; \
        done

diff --git a/settings.make b/settings.make
index 12599454e78e2f3803d4727741d82d95b882fb73..4b8d4e32ab9b7f01e6b7bc4e6f025efbdc09caa1 100644 (file)
--- a/settings.make
+++ b/settings.make
@@ -47,3 +47,5 @@ LDFLAGS= $(SUBDIR_LDFLAGS) $(DEBUG)
 OPTIMISE=      -O2
 DEBUG=         -g
 
+depr ?=                disable
+# set depr to '' to enable deprecated output