summaryrefslogtreecommitdiff
path: root/debian/rules
diff options
context:
space:
mode:
Diffstat (limited to 'debian/rules')
-rwxr-xr-xdebian/rules10
1 files changed, 7 insertions, 3 deletions
diff --git a/debian/rules b/debian/rules
index 993a70539..e67053cdd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -131,6 +131,7 @@ override_dh_autoreconf-indep:
131 131
132override_dh_auto_configure-arch: 132override_dh_auto_configure-arch:
133 dh_auto_configure -Bbuild-deb -- $(confflags) 133 dh_auto_configure -Bbuild-deb -- $(confflags)
134 dh_auto_configure -Bbuild-deb-ssh1 -- $(confflags) --with-ssh1
134 dh_auto_configure -Bbuild-udeb -- $(confflags_udeb) 135 dh_auto_configure -Bbuild-udeb -- $(confflags_udeb)
135 136
136override_dh_auto_configure-indep: 137override_dh_auto_configure-indep:
@@ -141,6 +142,7 @@ override_dh_auto_build-arch:
141 cd build-udeb && ./config.status 142 cd build-udeb && ./config.status
142 143
143 $(MAKE) -C build-deb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' 144 $(MAKE) -C build-deb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass'
145 $(MAKE) -C build-deb-ssh1 $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp ssh-keygen
144 $(MAKE) -C build-udeb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp sftp sshd ssh-keygen 146 $(MAKE) -C build-udeb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp sftp sshd ssh-keygen
145 147
146 $(MAKE) -C contrib gnome-ssh-askpass2 CC='$(CC) $(CPPFLAGS) $(CFLAGS) -Wall -Wl,--as-needed $(LDFLAGS)' PKG_CONFIG=$(PKG_CONFIG) 148 $(MAKE) -C contrib gnome-ssh-askpass2 CC='$(CC) $(CPPFLAGS) $(CFLAGS) -Wall -Wl,--as-needed $(LDFLAGS)' PKG_CONFIG=$(PKG_CONFIG)
@@ -167,7 +169,7 @@ endif
167override_dh_auto_test-indep: 169override_dh_auto_test-indep:
168 170
169override_dh_auto_clean: 171override_dh_auto_clean:
170 rm -rf build-deb build-udeb 172 rm -rf build-deb build-deb-ssh1 build-udeb
171ifeq ($(RUN_TESTS),yes) 173ifeq ($(RUN_TESTS),yes)
172 $(MAKE) -C debian/keygen-test clean 174 $(MAKE) -C debian/keygen-test clean
173endif 175endif
@@ -201,8 +203,10 @@ override_dh_install-indep:
201 dh_install 203 dh_install
202 204
203override_dh_installdocs: 205override_dh_installdocs:
204 dh_installdocs -Nopenssh-server -Nopenssh-sftp-server 206 dh_installdocs \
205 dh_installdocs -popenssh-server -popenssh-sftp-server \ 207 -Nopenssh-client-ssh1 -Nopenssh-server -Nopenssh-sftp-server
208 dh_installdocs \
209 -popenssh-client-ssh1 -popenssh-server -popenssh-sftp-server \
206 --link-doc=openssh-client 210 --link-doc=openssh-client
207 # Avoid breaking dh_installexamples later. 211 # Avoid breaking dh_installexamples later.
208 mkdir -p debian/openssh-server/usr/share/doc/openssh-client 212 mkdir -p debian/openssh-server/usr/share/doc/openssh-client