[Pkg-sysvinit-commits] r1766 - sysvinit/trunk/debian

[Petter Reinholdtsen]

Author: pere
Date: 2009-09-11 06:44:33 +0000 (Fri, 11 Sep 2009)
New Revision: 1766

Modified:
   sysvinit/trunk/debian/rules
Log:
Remove workaround for sarge's dpkg-architecture. Patch from Michael Biebl.

Modified: sysvinit/trunk/debian/rules
===================================================================
--- sysvinit/trunk/debian/rules	2009-09-11 06:36:23 UTC (rev 1765)
+++ sysvinit/trunk/debian/rules	2009-09-11 06:44:33 UTC (rev 1766)
@@ -18,10 +18,10 @@
 
 LC_ALL	= POSIX
 
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-export DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null || true)
+DEB_HOST_ARCH       ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 INSTALL_DATA = install -o root -g root -m 644
 INSTALL      = install -o root -g root -m 755
@@ -35,14 +35,6 @@
 CC=cc
 endif
 
-# Handle fact that sarge dpkg-architecture doesn't have DEB_HOST_ARCH_OS
-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
-
 # Set arch specific build flags
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 CONFFLAGS = WITH_SELINUX="yes"