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

[Kel Modderman]

Author: kelmo-guest
Date: 2009-07-26 09:08:12 +0000 (Sun, 26 Jul 2009)
New Revision: 1546

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/rules
Log:
Do not use brace expansion in debian/rules and remove need for
setting SHELL to /bin/bash.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-07-26 07:45:55 UTC (rev 1545)
+++ sysvinit/trunk/debian/changelog	2009-07-26 09:08:12 UTC (rev 1546)
@@ -11,8 +11,10 @@
     /forcefsck in checkfs.sh and checkroot.sh. (Closes: #529498)
   * Also allow fastboot on kernel cmdline to have same effect as touching
     /fastboot in checkfs.sh and checkroot.sh.
+  * Do not use brace expansion in debian/rules and remove need for
+    setting SHELL to /bin/bash.
 
- -- Kel Modderman <kel at otaku42.de>  Sun, 26 Jul 2009 17:41:35 +1000
+ -- Kel Modderman <kel at otaku42.de>  Sun, 26 Jul 2009 19:07:51 +1000
 
 sysvinit (2.87dsf-1) unstable; urgency=low
 

Modified: sysvinit/trunk/debian/rules
===================================================================
--- sysvinit/trunk/debian/rules	2009-07-26 07:45:55 UTC (rev 1545)
+++ sysvinit/trunk/debian/rules	2009-07-26 09:08:12 UTC (rev 1546)
@@ -6,7 +6,6 @@
 tmp     = $(shell pwd)/debian/tmp
 doc	= /usr/share/doc
 
-SHELL	= /bin/bash
 LC_ALL	= POSIX
 
 DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -62,7 +61,8 @@
 	#
 	-rm -rf $(tmp)
 	install -d -o root -g root -m 755 $(tmp)
-	install -d -o root -g root -m 755 $(tmp)/{DEBIAN,etc}
+	install -d -o root -g root -m 755 $(tmp)/DEBIAN
+	install -d -o root -g root -m 755 $(tmp)/etc
 	install -d -o root -g root -m 755 $(tmp)/usr/share/sysvinit
 	install -d -o root -g root -m 755 $(tmp)/usr/include
 	install -d -o root -g root -m 755 $(tmp)$(doc)/sysvinit
@@ -90,11 +90,15 @@
 	fi
 	install -o root -g root -m 755 debian/share/update-rc.d \
 		$(tmp)/usr/share/sysvinit
-	install -d -o root -g root -m 755 $(tmp)/{bin,sbin,usr}
+	install -d -o root -g root -m 755 $(tmp)/bin
+	install -d -o root -g root -m 755 $(tmp)/sbin
+	install -d -o root -g root -m 755 $(tmp)/usr
 	install -d -o root -g root -m 755 $(tmp)/usr/bin
 	install -d -o root -g root -m 755 $(tmp)/usr/sbin
 	install -d -o root -g root -m 755 $(tmp)/usr/share/man
-	install -d -o root -g root -m 755 $(tmp)/usr/share/man/man{1,5,8}
+	install -d -o root -g root -m 755 $(tmp)/usr/share/man/man1
+	install -d -o root -g root -m 755 $(tmp)/usr/share/man/man5
+	install -d -o root -g root -m 755 $(tmp)/usr/share/man/man8
 	$(MAKE) -C src $(CROSS) ROOT=$(tmp) DISTRO=Debian install
 ifeq ($(DEB_HOST_ARCH), hurd-i386)
 	# The Hurd has its own halt and reboot commands.
@@ -153,11 +157,14 @@
 	install -o root -g root -m 644 debian/changelog \
 		$(tmp)$(doc)/sysvinit-utils/changelog.Debian
 	gzip -9f $(tmp)$(doc)/sysvinit-utils/changelog*
-	install -d -o root -g root -m 755 $(tmp)/{bin,sbin,usr}
+	install -d -o root -g root -m 755 $(tmp)/bin
+	install -d -o root -g root -m 755 $(tmp)/sbin
+	install -d -o root -g root -m 755 $(tmp)/usr
 	install -d -o root -g root -m 755 $(tmp)/usr/bin
 	install -d -o root -g root -m 755 $(tmp)/usr/sbin
 	install -d -o root -g root -m 755 $(tmp)/usr/share/man
-	install -d -o root -g root -m 755 $(tmp)/usr/share/man/man{1,8}
+	install -d -o root -g root -m 755 $(tmp)/usr/share/man/man1
+	install -d -o root -g root -m 755 $(tmp)/usr/share/man/man8
 	install -o root -g root -m 755 src/killall5 $(tmp)/sbin
 	install -o root -g root -m 755 src/sulogin $(tmp)/sbin
 	install -o root -g root -m 755 src/fstab-decode $(tmp)/sbin
@@ -196,7 +203,10 @@
 	#
 	-rm -rf $(tmp)
 	install -d -o root -g root -m 755 $(tmp)
-	install -d -o root -g root -m 755 $(tmp)/{DEBIAN,sbin,lib,etc}
+	install -d -o root -g root -m 755 $(tmp)/DEBIAN
+	install -d -o root -g root -m 755 $(tmp)/sbin
+	install -d -o root -g root -m 755 $(tmp)/lib
+	install -d -o root -g root -m 755 $(tmp)/etc
 ifneq (,$(findstring $(DEB_HOST_ARCH_OS),linux kfreebsd))
 	install -d -o root -g root -m 755 $(tmp)/sys
 endif
@@ -266,7 +276,8 @@
 	# sysv-rc package
 	#
 	-rm -rf $(tmp)
-	install -d -o root -g root -m 755 $(tmp)/{DEBIAN,etc}
+	install -d -o root -g root -m 755 $(tmp)/DEBIAN
+	install -d -o root -g root -m 755 $(tmp)/etc
 	install -d -o root -g root -m 755 $(tmp)/usr/share
 	install -d -o root -g root -m 755 $(tmp)$(doc)/sysv-rc
 	install -o root -g root -m 644 debian/sysv-rc/doc/* $(tmp)$(doc)/sysv-rc
@@ -274,9 +285,9 @@
 		> $(tmp)$(doc)/sysv-rc/changelog.Debian
 	chmod 644 $(tmp)$(doc)/sysv-rc/changelog.Debian
 	gzip -9f $(tmp)$(doc)/sysv-rc/*
-	install -d -o root -g root -m 755 $(tmp)/etc/rc{2,3,4,5}.d
 	cp -af debian/sysv-rc/etc/* $(tmp)/etc
 	for N in 2 3 4 5 ; do \
+		install -d -o root -g root -m 755 $(tmp)/etc/rc$${N}.d ; \
 		install -o root -g root -m 644 debian/sysv-rc/rc2-5.d-README \
 			$(tmp)/etc/rc$${N}.d/README ; \
 	done