r796 - lvm2/trunk/debian/patches

[Bastian Blank]

Author: waldi
Date: Tue Mar 16 22:39:15 2010
New Revision: 796

Log:
debian/patches/rules-subdir.patch: Fix for dmevent build.

Modified:
   lvm2/trunk/debian/patches/rules-subdir.patch

Modified: lvm2/trunk/debian/patches/rules-subdir.patch
==============================================================================
--- lvm2/trunk/debian/patches/rules-subdir.patch	Tue Mar 16 22:38:57 2010	(r795)
+++ lvm2/trunk/debian/patches/rules-subdir.patch	Tue Mar 16 22:39:15 2010	(r796)
@@ -100,7 +100,7 @@
  endif
  
 -SUBDIRS += lib tools daemons libdm
-+SUBDIRS += libdm lib tools daemons
++SUBDIRS += libdm lib daemons tools
  
  ifeq ("@APPLIB@", "yes")
    SUBDIRS += liblvm
@@ -149,3 +149,27 @@
  
  $(MAN5) $(MAN8) $(MAN8CLUSTER):	Makefile
  
+--- a/daemons/Makefile.in
++++ b/daemons/Makefile.in
+@@ -18,10 +18,6 @@
+ 
+ .PHONY: dmeventd clvmd cmirrord
+ 
+-ifneq ("@CLVMD@", "none")
+-  SUBDIRS = clvmd
+-endif
+-
+ ifeq ("@BUILD_CMIRRORD@", "yes")
+   SUBDIRS += cmirrord
+ endif
+@@ -30,6 +26,10 @@
+   SUBDIRS += dmeventd
+ endif
+ 
++ifneq ("@CLVMD@", "none")
++  SUBDIRS += clvmd
++endif
++
+ include $(top_builddir)/make.tmpl
+ 
+ ifeq ("@BUILD_DMEVENTD@", "yes")