summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--WHATS_NEW1
-rw-r--r--libdaemon/Makefile.in7
2 files changed, 6 insertions, 2 deletions
diff --git a/WHATS_NEW b/WHATS_NEW
index 8f14bef49..813eb5eca 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.123 -
=================================
+ Fix makefile shell compare == when building lvmetad lvmpolld (2.02.120).
Add --type full to lvmconfig for full configuration tree view.
Add undocumented environment variables to lvm man page. (2.02.119)
Add device synchronization point before activating a new snapshot.
diff --git a/libdaemon/Makefile.in b/libdaemon/Makefile.in
index c0379a4c3..0a085db9f 100644
--- a/libdaemon/Makefile.in
+++ b/libdaemon/Makefile.in
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2004-2011 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2004-2015 Red Hat, Inc. All rights reserved.
#
# This file is part of LVM2.
#
@@ -19,7 +19,10 @@ top_builddir = @top_builddir@
SUBDIRS += client
-ifeq (yes, $(shell test @BUILD_LVMETAD@ == yes -o @BUILD_LVMPOLLD@ == yes && echo yes))
+ifeq (@BUILD_LVMETAD@,yes)
+ SUBDIRS += server
+server: client
+else ifeq (@BUILD_LVMPOLLD@,yes)
SUBDIRS += server
server: client
endif