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

[Petter Reinholdtsen]

Author: pere
Date: 2009-09-07 21:09:14 +0000 (Mon, 07 Sep 2009)
New Revision: 1741

Modified:
   sysvinit/trunk/debian/rules
Log:
Make rules file simpler.

Modified: sysvinit/trunk/debian/rules
===================================================================
--- sysvinit/trunk/debian/rules	2009-09-07 21:08:57 UTC (rev 1740)
+++ sysvinit/trunk/debian/rules	2009-09-07 21:09:14 UTC (rev 1741)
@@ -71,6 +71,9 @@
 binary-arch:	build
 	dh_testroot
 	dh_installdirs
+	$(MAKE) -C src $(CROSS) ROOT=$(tmp) DISTRO=Debian install
+	dh_install
+	dh_link
 	#
 	# sysvinit package
 	#
@@ -90,9 +93,6 @@
 	fi
 	$(INSTALL) debian/share/update-rc.d \
 		$(sysvtmp)/usr/share/sysvinit
-	$(MAKE) -C src $(CROSS) ROOT=$(tmp) DISTRO=Debian install
-	dh_install -psysvinit
-	dh_link -psysvinit
 ifeq ($(DEB_HOST_ARCH), hurd-i386)
 	# The Hurd has its own halt and reboot commands.
 	rm -f $(sysvtmp)/usr/share/man/man8/halt.8
@@ -112,8 +112,6 @@
 	#
 	# sysvinit-utils package
 	#
-	dh_install -psysvinit-utils
-	dh_link -psysvinit-utils
 	$(MAKE) $(CROSS) -C debian/startpar DESTDIR=$(utiltmp) install
 	$(INSTALL) debian/service/service $(utiltmp)/usr/sbin
 	$(INSTALL_DATA) debian/service/service.8 $(utiltmp)/usr/share/man/man8
@@ -128,7 +126,6 @@
 	# initscripts package
 	#
 	$(MAKE) -C debian/src/initscripts install DESTDIR=$(inittmp)
-	dh_install
 ifneq (,$(findstring $(DEB_HOST_ARCH_OS),linux kfreebsd))
 	$(INSTALL) -d $(inittmp)/sys
 endif
@@ -168,14 +165,14 @@
 	$(INSTALL) -d $(rctmp)$(overridedir)
 	$(INSTALL_DATA) debian/sysv-rc.lintian.overrides \
 		$(rctmp)$(overridedir)/sysv-rc
-	dh_installdocs -psysv-rc
-	dh_installchangelogs -psysv-rc
+	dh_installdocs -i
+	dh_installchangelogs -i
 	sed -i -ne '/sysvinit (2.84-3)/q' -e p \
 		$(rctmp)$(doc)/sysv-rc/changelog.Debian
 	# Only want the NEWS file in the sysvinit package
 	$(RM) $(rctmp)$(doc)/sysv-rc/NEWS.Debian
-	dh_installdebconf -psysv-rc
-	dh_installdeb -psysv-rc
+	dh_installdebconf -i
+	dh_installdeb -i
 	# Neither rc, rcS nor README are conffiles
 	$(RM) $(rctmp)/DEBIAN/conffiles
 	dh_fixperms -psysv-rc -X/etc/init.d/README