From 34090e04a26eaf4c043c2b6bffaa1cb2e0eac1ff Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 1 Jun 2005 17:06:42 +0000 Subject: Fix DEB_HOST_ARCH_OS/DEB_HOST_GNU_SYSTEM compatibility handling. --- debian/rules | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 0398cbaa7..ce831e55d 100755 --- a/debian/rules +++ b/debian/rules @@ -17,7 +17,15 @@ endif VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 | sed 's/.*://') DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) -DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null || dpkg-architecture -qDEB_HOST_GNU_SYSTEM) +DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null) + +# Take account of old dpkg-architecture output. +ifeq ($(DEB_HOST_ARCH_OS),) + DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)) + ifeq ($(DEB_HOST_ARCH_OS),gnu) + DEB_HOST_ARCH_OS := hurd + endif +endif CLIENT_UDEB := openssh-client-udeb_$(VERSION)_$(DEB_HOST_ARCH).udeb SERVER_UDEB := openssh-server-udeb_$(VERSION)_$(DEB_HOST_ARCH).udeb @@ -45,7 +53,7 @@ PAMDEP := libpam-runtime endif # The Hurd needs libcrypt for res_query et al. -ifeq ($(DEB_HOST_ARCH_OS),gnu) +ifeq ($(DEB_HOST_ARCH_OS),hurd) FORCE_LIBS := LIBS=-lcrypt endif @@ -134,7 +142,7 @@ install: build install -m 644 -c contrib/ssh-copy-id.1 debian/openssh-client/usr/share/man/man1/ssh-copy-id.1 install -m 644 debian/moduli.5 debian/openssh-client/usr/share/man/man5/moduli.5 -ifneq ($(DEB_HOST_ARCH_OS),gnu) +ifneq ($(DEB_HOST_ARCH_OS),hurd) if [ -f contrib/gnome-ssh-askpass2 ]; then \ install -s -o root -g root -m 755 contrib/gnome-ssh-askpass2 debian/ssh-askpass-gnome/usr/lib/openssh/gnome-ssh-askpass; \ elif [ -f contrib/gnome-ssh-askpass1 ]; then \ @@ -161,7 +169,7 @@ binary-indep: binary-ssh # Build architecture-dependent files here. binary-arch: binary-openssh-client binary-openssh-server -ifneq ($(DEB_HOST_ARCH_OS),gnu) +ifneq ($(DEB_HOST_ARCH_OS),hurd) binary-arch: binary-ssh-askpass-gnome endif binary-arch: binary-openssh-client-udeb binary-openssh-server-udeb -- cgit v1.2.3