From f7234c24c90a60598018fbaa020f15a5ca3c82f0 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 2 Jan 2018 00:59:19 +0000 Subject: Support the "noudeb" build profile. --- debian/rules | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 734ab9c5b..225655612 100755 --- a/debian/rules +++ b/debian/rules @@ -132,17 +132,20 @@ override_dh_autoreconf-indep: override_dh_auto_configure-arch: dh_auto_configure -Bdebian/build-deb -- $(confflags) +ifeq ($(filter noudeb,$(DEB_BUILD_PROFILES)),) dh_auto_configure -Bdebian/build-udeb -- $(confflags_udeb) - -override_dh_auto_configure-indep: - -override_dh_auto_build-arch: # Avoid libnsl linkage. Ugh. perl -pi -e 's/ +-lnsl//' debian/build-udeb/config.status cd debian/build-udeb && ./config.status +endif +override_dh_auto_configure-indep: + +override_dh_auto_build-arch: $(MAKE) -C debian/build-deb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' +ifeq ($(filter noudeb,$(DEB_BUILD_PROFILES)),) $(MAKE) -C debian/build-udeb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp sftp sshd ssh-keygen +endif ifeq ($(filter pkg.openssh.nognome,$(DEB_BUILD_PROFILES)),) $(MAKE) -C contrib gnome-ssh-askpass3 CC='$(CC) $(CPPFLAGS) $(CFLAGS) -Wall -Wl,--as-needed $(LDFLAGS)' PKG_CONFIG=$(PKG_CONFIG) @@ -180,8 +183,10 @@ override_dh_install-arch: rm -f debian/tmp/etc/ssh/sshd_config dh_install -Nopenssh-client-udeb -Nopenssh-server-udeb --fail-missing +ifeq ($(filter noudeb,$(DEB_BUILD_PROFILES)),) dh_install -popenssh-client-udeb -popenssh-server-udeb \ --sourcedir=debian/build-udeb +endif # Remove version control tags to avoid unnecessary conffile # resolution steps for administrators. -- cgit v1.2.3