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

[Petter Reinholdtsen]

Author: pere
Date: 2009-09-09 21:56:35 +0000 (Wed, 09 Sep 2009)
New Revision: 1753

Modified:
   sysvinit/trunk/debian/rules
Log:
Use the same build rules for all builds. Patch from Michael Biebl.

Modified: sysvinit/trunk/debian/rules
===================================================================
--- sysvinit/trunk/debian/rules	2009-09-09 21:55:17 UTC (rev 1752)
+++ sysvinit/trunk/debian/rules	2009-09-09 21:56:35 UTC (rev 1753)
@@ -3,6 +3,9 @@
 #	debian/rules file for sysvinit
 #
 
+# Uncomment this to turn on verbose mode.
+# export DH_VERBOSE=1
+
 tmp     = $(shell pwd)/debian/tmp
 sysvtmp = $(shell pwd)/debian/sysvinit
 utiltmp = $(shell pwd)/debian/sysvinit-utils
@@ -37,6 +40,11 @@
   endif
 endif
 
+# Set arch specific build flags
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+CONFFLAGS = WITH_SELINUX="yes"
+endif
+
 PATCH_STAMP=debian/stamp-patched
 patch: $(PATCH_STAMP)
 $(PATCH_STAMP):
@@ -57,13 +65,9 @@
 build-stamp: patch
 # Builds the binary package.
 	dh_testdir
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-	$(MAKE) -C src $(CROSS) DISTRO=Debian WITH_SELINUX="yes"
-else
-	$(MAKE) -C src $(CROSS) DISTRO=Debian
-endif
+	$(MAKE) $(CROSS) $(CONFFLAGS) -C src DISTRO=Debian
 	$(MAKE) $(CROSS) -C debian/startpar
-	$(CC) -W -Wall -s -o debian/readlink debian/readlink.c
+	$(MAKE) $(CROSS) debian/readlink
 	touch $@
 
 # Make a binary package (.deb file)