diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2015-05-18 12:16:24 +0200 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2015-05-18 12:45:42 +0200 |
| commit | 62ac80c8fad09fb14f27d56663a5377948e20fce (patch) | |
| tree | 2353d4cb3dbdfb1ea9912f9a4cf680677f5163fc | |
| parent | 30c3bbcd9e852d7f79846ecc57148a47e52e818d (diff) | |
| download | lvm2-62ac80c8fad09fb14f27d56663a5377948e20fce.tar.gz | |
makefiles: drop LVM_SHARED_PATH
We already have LVM_PATH define used everywhere else
to access LVM binary so stay with one name.
| -rw-r--r-- | tools/Makefile.in | 2 | ||||
| -rw-r--r-- | tools/lvmcmdline.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in index 9bbf87b5b..cec74a9e7 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -114,8 +114,6 @@ LVMLIBS += -ldevmapper EXPORTED_HEADER = $(srcdir)/lvm2cmd.h EXPORTED_FN_PREFIX = lvm2 -DEFS += -DLVM_SHARED_PATH=\"$(exec_prefix)/sbin/lvm\" - CFLOW_LIST = lvmcmdlib.c lvm2cmd.c CFLOW_LIST_TARGET = liblvm2cmd.cflow CFLOW_TARGET = lvm diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c index 78974df0e..29fffb311 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c @@ -1925,12 +1925,12 @@ int lvm2_main(int argc, char **argv) return -1; if (is_static() && strcmp(base, "lvm.static") && - path_exists(LVM_SHARED_PATH) && + path_exists(LVM_PATH) && !getenv("LVM_DID_EXEC")) { if (setenv("LVM_DID_EXEC", base, 1)) log_sys_error("setenv", "LVM_DID_EXEC"); - if (execvp(LVM_SHARED_PATH, argv) == -1) - log_sys_error("execvp", "LVM_SHARED_PATH"); + if (execvp(LVM_PATH, argv) == -1) + log_sys_error("execvp", LVM_PATH); if (unsetenv("LVM_DID_EXEC")) log_sys_error("unsetenv", "LVM_DID_EXEC"); } |