5 files changed, 25 insertions, 25 deletions

diff --git a/.gitignore b/.gitignore
index 3d984650a..11c73eeb3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,6 @@
 /*.out
 /Makefile
 /autom4te.cache
-/build-deb
-/build-deb-stamp
-/build-udeb
-/build-udeb-stamp
 /buildit.sh
 /buildpkg.sh
 /config.cache
@@ -33,6 +29,9 @@ contrib/gnome-ssh-askpass2
 openbsd-compat/Makefile
 debian/*.debhelper*
 debian/*substvars
+debian/build-deb
+debian/build-deb-ssh1
+debian/build-udeb
 debian/files
 debian/keygen-test/key1
 debian/keygen-test/key1.pub
diff --git a/debian/changelog b/debian/changelog
index dfcdce75b..ed6013816 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ openssh (1:7.3p1-4) UNRELEASED; urgency=medium
 
   * Adjust Build-Depends further to avoid considering libssl-dev >= 1.1.0~
     as sufficient.
+  * Move build directories under debian/.
 
  -- Colin Watson <cjwatson@debian.org>  Fri, 11 Nov 2016 02:50:39 +0000
 
diff --git a/debian/keygen-test/keygen-test b/debian/keygen-test/keygen-test
index 02b7c761a..2abe815ef 100755
--- a/debian/keygen-test/keygen-test
+++ b/debian/keygen-test/keygen-test
@@ -2,9 +2,9 @@
 
 rm -f key1 key1.pub key2 key2.pub
 LD_PRELOAD="$(pwd)/getpid.so" FORCE_PID=1234 \
-        ../../build-deb/ssh-keygen -N '' -f key1 >/dev/null
+        ../build-deb/ssh-keygen -N '' -f key1 >/dev/null
 LD_PRELOAD="$(pwd)/getpid.so" FORCE_PID=1234 \
-        ../../build-deb/ssh-keygen -N '' -f key2 >/dev/null
+        ../build-deb/ssh-keygen -N '' -f key2 >/dev/null
 if cmp -s key1 key2; then
         echo "Generated two identical keys!" >&2
         exit 1
diff --git a/debian/openssh-client-ssh1.install b/debian/openssh-client-ssh1.install
index 04e7e0c45..60a8bc58a 100755
--- a/debian/openssh-client-ssh1.install
+++ b/debian/openssh-client-ssh1.install
@@ -1,5 +1,5 @@
 #! /usr/bin/dh-exec
 
-build-deb-ssh1/scp => usr/bin/scp1
-build-deb-ssh1/ssh => usr/bin/ssh1
-build-deb-ssh1/ssh-keygen => usr/bin/ssh-keygen1
+debian/build-deb-ssh1/scp => usr/bin/scp1
+debian/build-deb-ssh1/ssh => usr/bin/ssh1
+debian/build-deb-ssh1/ssh-keygen => usr/bin/ssh-keygen1
diff --git a/debian/rules b/debian/rules
index b5dd9f976..76e71ecf1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -131,20 +131,20 @@ override_dh_autoreconf-arch:
 override_dh_autoreconf-indep:
 
 override_dh_auto_configure-arch:
-        dh_auto_configure -Bbuild-deb -- $(confflags)
-        dh_auto_configure -Bbuild-deb-ssh1 -- $(confflags) --with-ssh1
-        dh_auto_configure -Bbuild-udeb -- $(confflags_udeb)
+        dh_auto_configure -Bdebian/build-deb -- $(confflags)
+        dh_auto_configure -Bdebian/build-deb-ssh1 -- $(confflags) --with-ssh1
+        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//' build-udeb/config.status
-        cd build-udeb && ./config.status
+        perl -pi -e 's/ +-lnsl//' debian/build-udeb/config.status
+        cd debian/build-udeb && ./config.status
 
-        $(MAKE) -C build-deb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass'
-        $(MAKE) -C build-deb-ssh1 $(PARALLEL) SSH_PROGRAM='/usr/bin/ssh1' ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp ssh-keygen
-        $(MAKE) -C build-udeb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp sftp sshd ssh-keygen
+        $(MAKE) -C debian/build-deb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass'
+        $(MAKE) -C debian/build-deb-ssh1 $(PARALLEL) SSH_PROGRAM='/usr/bin/ssh1' ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp ssh-keygen
+        $(MAKE) -C debian/build-udeb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp sftp sshd ssh-keygen
 
         $(MAKE) -C contrib gnome-ssh-askpass2 CC='$(CC) $(CPPFLAGS) $(CFLAGS) -Wall -Wl,--as-needed $(LDFLAGS)' PKG_CONFIG=$(PKG_CONFIG)
 
@@ -152,32 +152,32 @@ override_dh_auto_build-indep:
 
 override_dh_auto_test-arch:
 ifeq ($(RUN_TESTS),yes)
-        $(MAKE) -C build-deb regress-prep
-        $(MAKE) -C build-deb $(PARALLEL) \
+        $(MAKE) -C debian/build-deb regress-prep
+        $(MAKE) -C debian/build-deb $(PARALLEL) \
                 regress/unittests/sshbuf/test_sshbuf \
                 regress/unittests/sshkey/test_sshkey \
                 regress/unittests/bitmap/test_bitmap \
                 regress/unittests/hostkeys/test_hostkeys \
                 regress/unittests/kex/test_kex
-        $(MAKE) -C build-deb/regress \
-                .OBJDIR="$(CURDIR)/build-deb/regress" \
+        $(MAKE) -C debian/build-deb/regress \
+                .OBJDIR="$(CURDIR)/debian/build-deb/regress" \
                 .CURDIR="$(CURDIR)/regress" \
                 unit
-        $(MAKE) -C build-deb compat-tests
+        $(MAKE) -C debian/build-deb compat-tests
         $(MAKE) -C debian/keygen-test
 endif
 
 override_dh_auto_test-indep:
 
 override_dh_auto_clean:
-        rm -rf build-deb build-deb-ssh1 build-udeb
+        rm -rf debian/build-deb debian/build-deb-ssh1 debian/build-udeb
 ifeq ($(RUN_TESTS),yes)
         $(MAKE) -C debian/keygen-test clean
 endif
         $(MAKE) -C contrib clean
 
 override_dh_auto_install-arch:
-        $(MAKE) -C build-deb DESTDIR=`pwd`/debian/tmp install-nokeys
+        $(MAKE) -C debian/build-deb DESTDIR=`pwd`/debian/tmp install-nokeys
 
 override_dh_auto_install-indep:
 
@@ -186,7 +186,7 @@ override_dh_install-arch:
 
         dh_install -Nopenssh-client-udeb -Nopenssh-server-udeb --fail-missing
         dh_install -popenssh-client-udeb -popenssh-server-udeb \
-                --sourcedir=build-udeb
+                --sourcedir=debian/build-udeb
 
         # Remove version control tags to avoid unnecessary conffile
         # resolution steps for administrators.