[Pkg-virtualbox-commits] r323 - in trunk/debian: . virtualbox-ose-guest-source.files

[lool at alioth.debian.org]

Author: lool
Date: 2008-07-07 12:14:47 +0000 (Mon, 07 Jul 2008)
New Revision: 323

Modified:
   trunk/debian/changelog
   trunk/debian/rules
   trunk/debian/virtualbox-ose-guest-source.files/rules
Log:
Drop useless subshells in rules files and export environment vars
explicitely; also change "cd foo; $(MAKE)" patterns to "$(MAKE) -C foo".

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-07-02 16:36:48 UTC (rev 322)
+++ trunk/debian/changelog	2008-07-07 12:14:47 UTC (rev 323)
@@ -1,7 +1,12 @@
 virtualbox-ose (1.6.2-dfsg-3) UNRELEASED; urgency=low
 
+  [ Daniel Baumann ]
   * Removing empty lines at EOF and whitespaces at EOL.
 
+  [ Loic Minier ]
+  * Drop useless subshells in rules files and export environment vars
+    explicitely; also change "cd foo; $(MAKE)" patterns to "$(MAKE) -C foo".
+
  -- Daniel Baumann <daniel at debian.org>  Wed,  2 Jul 2008 18:33:00 +0200
 
 virtualbox-ose (1.6.2-dfsg-2) unstable; urgency=low

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2008-07-02 16:36:48 UTC (rev 322)
+++ trunk/debian/rules	2008-07-07 12:14:47 UTC (rev 323)
@@ -34,7 +34,7 @@
 # ... and text/plain
 debian/virtualbox-ose.README.Debian: debian/README.Debian.html
 	chmod 755 debian/lynx-dump-postprocess
-	(LANG=C; lynx -force_html -dump $< | ./debian/lynx-dump-postprocess > $@.tmp)
+	export LANG=C; lynx -force_html -dump $< | ./debian/lynx-dump-postprocess > $@.tmp
 	mv $@.tmp $@
 
 env.sh: patch-stamp
@@ -54,9 +54,9 @@
 build-stamp: env.sh
 	dh_testdir
 	# Building package
-	(. env.sh; $(MAKE) \
+	. env.sh; $(MAKE) \
 		BUILD_TYPE=release \
-		PATH_OUT=$(abspath out))
+		PATH_OUT=$(abspath out)
 	# make sure VBoxAddIF.sh is built, too
 	$(MAKE) -C src/VBox/Installer/linux $(abspath out/bin/VBoxAddIF.sh) \
 		PATH_OUT=$(abspath out)
@@ -97,10 +97,10 @@
 	rm -f ./src/VBox/HostServices/SharedClipboard/linux-stub.cpp
 	rm -f ./src/VBox/Additions/linux/xmouse/Imakefile
 	rm -rf ./src/VBox/Additions/linux/selinux-fedora
-	(cd ..; mv $(CURDIR) virtualbox-ose-$(upstreamversion)-dfsg; \
+	cd ..; mv $(CURDIR) virtualbox-ose-$(upstreamversion)-dfsg; \
 	    tar --exclude .svn --exclude '.git*' --exclude debian \
 	        -czf virtualbox-ose_$(upstreamversion)-dfsg.orig.tar.gz \
-	        virtualbox-ose-$(upstreamversion)-dfsg)
+	        virtualbox-ose-$(upstreamversion)-dfsg
 
 # install: DH_OPTIONS=
 install: build debian/virtualbox-ose.README.Debian debian/README.Debian.html

Modified: trunk/debian/virtualbox-ose-guest-source.files/rules
===================================================================
--- trunk/debian/virtualbox-ose-guest-source.files/rules	2008-07-02 16:36:48 UTC (rev 322)
+++ trunk/debian/virtualbox-ose-guest-source.files/rules	2008-07-07 12:14:47 UTC (rev 323)
@@ -42,8 +42,8 @@
 MAKE:=kmk
 
 clean:
-	(cd vboxadd; $(MAKE) clean)
-	(cd vboxvfs; $(MAKE) clean)
+	$(MAKE) -C vboxadd clean
+	$(MAKE) -C vboxvfs
 	dh_clean
 
 binary-modules: prep-deb-files