diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2017-08-01 11:17:04 +0200 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2017-08-01 11:53:11 +0200 |
| commit | c1b5f38bbe30e14f33a0cd76eed74c48280865ee (patch) | |
| tree | e86c41efd580db59a810805ba70a9d9c4adf4e5a | |
| parent | 8256170e6a2dbed15b790e75f5d1026e3de69a16 (diff) | |
| download | lvm2-c1b5f38bbe30e14f33a0cd76eed74c48280865ee.tar.gz | |
man: fix generated paths
Use user configured paths instead of some developers paths ;)
| -rw-r--r-- | WHATS_NEW | 1 | ||||
| -rw-r--r-- | make.tmpl.in | 1 | ||||
| -rw-r--r-- | man/Makefile.in | 8 |
3 files changed, 6 insertions, 4 deletions
@@ -1,5 +1,6 @@ Version 2.02.174 - ================================= + Fix some paths in generated makefiles to respected configured settings. Add warning when creating thin-pool with zeroing and chunk size >= 512KiB. Introduce exit code 4 EINIT_FAILED to replace -1 when initialisation fails. Add synchronization points with udev during reshape of raid LVs. diff --git a/make.tmpl.in b/make.tmpl.in index cb5953a8a..2b2ddd16a 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -123,6 +123,7 @@ DEFAULT_CACHE_DIR = $(DEFAULT_SYS_DIR)/@DEFAULT_CACHE_SUBDIR@ DEFAULT_PROFILE_DIR = $(DEFAULT_SYS_DIR)/@DEFAULT_PROFILE_SUBDIR@ DEFAULT_LOCK_DIR = @DEFAULT_LOCK_DIR@ DEFAULT_RUN_DIR = @DEFAULT_RUN_DIR@ +DEFAULT_PID_DIR = @DEFAULT_PID_DIR@ DEFAULT_MANGLING = @MANGLING@ # Setup vpath search paths for some suffixes diff --git a/man/Makefile.in b/man/Makefile.in index d0efb5d60..f88b56900 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -179,10 +179,10 @@ $(SED) -e "s+#VERSION#+$(LVM_VERSION)+" \ -e "s+#DEFAULT_PROFILE_DIR#+$(DEFAULT_PROFILE_DIR)+" \ -e "s+#DEFAULT_CACHE_DIR#+$(DEFAULT_CACHE_DIR)+" \ -e "s+#DEFAULT_LOCK_DIR#+$(DEFAULT_LOCK_DIR)+" \ - -e "s+#CLVMD_PATH#+/data/lvmtest/usr/sbin/clvmd+" \ - -e "s+#LVM_PATH#+/data/lvmtest/sbin/lvm+" \ - -e "s+#DEFAULT_RUN_DIR#+/var/run/lvm+" \ - -e "s+#DEFAULT_PID_DIR#+/var/run+" \ + -e "s+#CLVMD_PATH#+$(exec_prefix)/clvmd+" \ + -e "s+#LVM_PATH#+$(exec_prefix)/lvm+" \ + -e "s+#DEFAULT_RUN_DIR#+$(DEFAULT_RUN_DIR)+" \ + -e "s+#DEFAULT_PID_DIR#+$(DEFAULT_PID_DIR)+" \ -e "s+#SYSTEMD_GENERATOR_DIR#+$(SYSTEMD_GENERATOR_DIR)+" \ -e "s+#DEFAULT_MANGLING#+$(DEFAULT_MANGLING)+" $< > $@ endef |