diff options
| author | Ferenc Wágner <wferi@niif.hu> | 2015-06-26 09:00:16 +0200 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2015-06-26 22:11:45 +0200 |
| commit | a62cd64db6c65637f2f2125222962696a7c7c5ee (patch) | |
| tree | 084916b830915c3f7ed25fac15c952b7b53cded4 | |
| parent | 844707067b5aef9bbcdf169b66a25bb79690d325 (diff) | |
| download | lvm2-a62cd64db6c65637f2f2125222962696a7c7c5ee.tar.gz | |
makefiles: avoid bash == operator syntax, use = instead
Commit e587b0677b705786a78f21bac1966621f70b2752 broke the build on
systems where /bin/sh is Dash, for example.
Origin patch by Ferenc Wágner <wferi@niif.hu> changed later to
avoid using shell call, so makefile add 'server' target when
one of metad or polld daemon is requested.
| -rw-r--r-- | WHATS_NEW | 1 | ||||
| -rw-r--r-- | libdaemon/Makefile.in | 7 |
2 files changed, 6 insertions, 2 deletions
@@ -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 |