1
0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00

configure: fix CLVMD_PATH location

Commit d2c116058e introduced regression
with CLVMD_PATH.

+        CLVMD_PATH="$clvmd_prefix/sbin/clvmd"
         test "$prefix" != NONE && clvmd_prefix=$prefix

It has set CLVMD_PATH before clvmd_prefix got its final value.
Move it one line below.
This commit is contained in:
Zdenek Kabelac 2014-11-21 16:33:48 +01:00
parent 089bdc0be4
commit 6ce8e57989
3 changed files with 3 additions and 2 deletions

View File

@ -1,5 +1,6 @@
Version 2.02.113 - Version 2.02.113 -
===================================== =====================================
Respect --prefix when setting CLMVD_PATH configure (2.02.89).
Default to configure --enable-udev-systemd-background-jobs for systemd>=205. Default to configure --enable-udev-systemd-background-jobs for systemd>=205.
Fix ignore_vg() to properly react on various vg_read errors (2.02.112). Fix ignore_vg() to properly react on various vg_read errors (2.02.112).
Failed recovery returns FAILED_RECOVERY status flag for vg_read(). Failed recovery returns FAILED_RECOVERY status flag for vg_read().

2
configure vendored
View File

@ -12433,8 +12433,8 @@ _ACEOF
if test "$CLVMD" != none; then if test "$CLVMD" != none; then
clvmd_prefix=$ac_default_prefix clvmd_prefix=$ac_default_prefix
CLVMD_PATH="$clvmd_prefix/sbin/clvmd"
test "$prefix" != NONE && clvmd_prefix=$prefix test "$prefix" != NONE && clvmd_prefix=$prefix
CLVMD_PATH="$clvmd_prefix/sbin/clvmd"
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define CLVMD_PATH "$CLVMD_PATH" #define CLVMD_PATH "$CLVMD_PATH"

View File

@ -1545,8 +1545,8 @@ AC_DEFINE_UNQUOTED(LVM_PATH, ["$LVM_PATH"], [Path to lvm binary.])
if test "$CLVMD" != none; then if test "$CLVMD" != none; then
clvmd_prefix=$ac_default_prefix clvmd_prefix=$ac_default_prefix
CLVMD_PATH="$clvmd_prefix/sbin/clvmd"
test "$prefix" != NONE && clvmd_prefix=$prefix test "$prefix" != NONE && clvmd_prefix=$prefix
CLVMD_PATH="$clvmd_prefix/sbin/clvmd"
AC_DEFINE_UNQUOTED(CLVMD_PATH, ["$CLVMD_PATH"], [Path to clvmd binary.]) AC_DEFINE_UNQUOTED(CLVMD_PATH, ["$CLVMD_PATH"], [Path to clvmd binary.])
fi fi