Fix wrong usage of exec_prefix from previous patch introducing LVM_PATH define

Introduce lvm_exec_prefix with resolved exec_prefix.
(using same ac_default_prefix as for CLVMD_PATH)
Use lvm_exec_prefix instead of dmeventd_prefix (fixes missing ac_default_prefix)

Note: This patch is rather hot-fix as currently generate code
does not create correct code for make exec_prefix=

diff --git a/configure b/configure
index ed896219e0303b3d023d78368b16dd126f33d75d..7f5fde0b590255a88ab99ceda83f5b46bea3c707 100755 (executable)
--- a/configure
+++ b/configure
@@ -15518,8 +15518,12 @@ _ACEOF
 fi
 
 
+lvm_exec_prefix=$exec_prefix
+test "$lvm_exec_prefix" = NONE && lvm_exec_prefix=$prefix
+test "$lvm_exec_prefix" = NONE && lvm_exec_prefix=$ac_default_prefix
+
 cat >>confdefs.h <<_ACEOF
-#define LVM_PATH "$exec_prefix/sbin/lvm"
+#define LVM_PATH "$lvm_exec_prefix/sbin/lvm"
 _ACEOF
 
 
@@ -15556,13 +15560,6 @@ fi
 
 
 if test "$BUILD_DMEVENTD" = yes; then
-        dmeventd_prefix="$exec_prefix"
-        if test "x$dmeventd_prefix" = "xNONE"; then
-                dmeventd_prefix="$prefix"
-        fi
-        if test "x$dmeventd_prefix" = "xNONE"; then
-                dmeventd_prefix=""
-        fi
 
 # Check whether --with-dmeventd-path was given.
 if test "${with_dmeventd_path+set}" = set; then
@@ -15572,7 +15569,7 @@ _ACEOF
 
 else
    cat >>confdefs.h <<_ACEOF
-#define DMEVENTD_PATH "$dmeventd_prefix/sbin/dmeventd"
+#define DMEVENTD_PATH "$lvm_exec_prefix/sbin/dmeventd"
 _ACEOF
 
 fi

diff --git a/configure.in b/configure.in
index aeee385857c9c6b7c126b3a4d21c1a2db800c233..c12ed709ae7c7764e8a721be70dd2c0b1b2efbc9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1009,7 +1009,11 @@ if test x$MODPROBE_CMD != x; then
        AC_DEFINE_UNQUOTED([MODPROBE_CMD], ["$MODPROBE_CMD"], [The path to 'modprobe', if available.])
 fi
 
-AC_DEFINE_UNQUOTED(LVM_PATH, ["$exec_prefix/sbin/lvm"], [Path to lvm binary.])
+
+lvm_exec_prefix=$exec_prefix
+test "$lvm_exec_prefix" = NONE && lvm_exec_prefix=$prefix
+test "$lvm_exec_prefix" = NONE && lvm_exec_prefix=$ac_default_prefix
+AC_DEFINE_UNQUOTED(LVM_PATH, ["$lvm_exec_prefix/sbin/lvm"], [Path to lvm binary.])
 
 if  test "$CLVMD" != none; then
         clvmd_prefix=$ac_default_prefix
@@ -1029,17 +1033,10 @@ fi
 
 AH_TEMPLATE(DMEVENTD_PATH, [Path to dmeventd binary.])
 if test "$BUILD_DMEVENTD" = yes; then
-        dmeventd_prefix="$exec_prefix"
-        if test "x$dmeventd_prefix" = "xNONE"; then
-                dmeventd_prefix="$prefix"
-        fi
-        if test "x$dmeventd_prefix" = "xNONE"; then
-                dmeventd_prefix=""
-        fi
        AC_ARG_WITH(dmeventd-path,
                    [  --with-dmeventd-path=PATH       dmeventd path [[EPREFIX/sbin/dmeventd]] ],
                    [ AC_DEFINE_UNQUOTED(DMEVENTD_PATH,"$withval") ],
-                   [ AC_DEFINE_UNQUOTED(DMEVENTD_PATH,"$dmeventd_prefix/sbin/dmeventd") ])
+                   [ AC_DEFINE_UNQUOTED(DMEVENTD_PATH,"$lvm_exec_prefix/sbin/dmeventd") ])
 fi
 
 ################################################################################