Merge lp:~peter-pearse/ubuntu/natty/libxcb/prop001 into lp:ubuntu/natty/libxcb

[Peter Pearse]

Empty target rules will match pattern rules - make sure the rule here isn't empty.

Unmerged revisions

26. By Peter Pearse on 2011-04-07

Prevent call to pattern rule when check target is empty.

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-28 23:00:11 +0000
+++ debian/changelog	2011-04-07 14:00:11 +0000
@@ -1,3 +1,9 @@
+libxcb (1.7-2ubuntu3) natty; urgency=low
+
+  * Prevent call to pattern rule when check target is empty
+
+ -- Peter Pearse <[e-mail]>  Thu, 07 Apr 2011 11:56:16 +0000
+
 libxcb (1.7-2ubuntu2) natty; urgency=low
 
   * Install udeb contents to /usr/lib, not to the multiarch directory.
 
=== modified file 'debian/rules'
--- debian/rules	2011-03-22 08:18:22 +0000
+++ debian/rules	2011-04-07 14:00:11 +0000
@@ -23,8 +23,13 @@
 	dh_auto_configure -B$(DEB_BUILDDIR) -- CFLAGS="$(CFLAGS)"
 
 check:
+	@echo "Get this one"
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	$(MAKE) -C $(DEB_BUILDDIR) check
+else
+	# In order to avoid calling the pattern rule below
+	# there needs to always be some action in this rule
+	@echo "DEB_BUILD_OPTIONS has nocheck"
 endif
 
 override_dh_auto_test: check