diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-05-17 18:14:38 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-05-17 18:14:38 +0100 |
| commit | 84e9bd3c29059fa73986dc11cfc5fed4e69af184 (patch) | |
| tree | 1ebf6cdf356422303026d673201dc871cf18eb84 | |
| parent | 3285b081a69af26bb46ecefb88fa6d602a442c94 (diff) | |
| download | userv-utils-84e9bd3c29059fa73986dc11cfc5fed4e69af184.tar.gz | |
Make deprecated things not built by default by Makefile (and remove code in debian/rules for achieving this).
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | debian/rules | 3 | ||||
| -rw-r--r-- | settings.make | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index e62edb3..fe74583 100644 --- 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 2c604d8..6c715d1 100755 --- 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 1259945..4b8d4e3 100644 --- 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 |