r879 - lvm2/trunk/debian/patches

[Bastian Blank]

Author: waldi
Date: Thu Oct 20 18:09:57 2011
New Revision: 879

Log:
debian/patches/rules-subdir.patch: Fix.

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

Modified: lvm2/trunk/debian/patches/rules-subdir.patch
==============================================================================
--- lvm2/trunk/debian/patches/rules-subdir.patch	Thu Oct 20 17:51:25 2011	(r878)
+++ lvm2/trunk/debian/patches/rules-subdir.patch	Thu Oct 20 18:09:57 2011	(r879)
@@ -22,7 +22,7 @@
  TARGETS += $(LIB_SHARED) $(LIB_STATIC)
  
 -all: $(SUBDIRS) $(TARGETS)
-+all: subdirs-all $(TARGETS)
++all: subdirs-device-mapper subdirs-all $(TARGETS)
  
 -install: all $(SUBDIRS.install)
 -install_cluster: all $(SUBDIRS.install_cluster)
@@ -98,7 +98,7 @@
  endif
  
 -SUBDIRS += lib tools daemons libdm
-+SUBDIRS += libdm lib daemons tools
++SUBDIRS += libdm lib tools daemons
  
  ifeq ("@APPLIB@", "yes")
    SUBDIRS += liblvm
@@ -163,7 +163,7 @@
  ifeq ("@BUILD_CMIRRORD@", "yes")
    SUBDIRS += cmirrord
  endif
-@@ -36,6 +32,10 @@
+@@ -36,8 +32,13 @@
    SUBDIRS = clvmd cmirrord dmeventd
  endif
  
@@ -174,3 +174,7 @@
  include $(top_builddir)/make.tmpl
  
  ifeq ("@BUILD_DMEVENTD@", "yes")
+-device-mapper: dmeventd.device-mapper
++device-mapper:
++	$(MAKE) -C dmeventd device-mapper
+ endif