<div dir="ltr">Merged.<div>Thanks.</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Aug 29, 2016 at 12:10 AM, Xose Vazquez Perez <span dir="ltr"><<a href="mailto:xose.vazquez@gmail.com" target="_blank">xose.vazquez@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">replace mandir with man8dir and put KRNL variables in place.<br>
<br>
Cc: Christophe Varoqui <<a href="mailto:christophe.varoqui@opensvc.com">christophe.varoqui@opensvc.<wbr>com</a>><br>
Cc: device-mapper development <<a href="mailto:dm-devel@redhat.com">dm-devel@redhat.com</a>><br>
Signed-off-by: Xose Vazquez Perez <<a href="mailto:xose.vazquez@gmail.com">xose.vazquez@gmail.com</a>><br>
---<br>
Makefile | 5 ++---<br>
Makefile.inc | 2 +-<br>
kpartx/Makefile | 6 +++---<br>
mpathpersist/Makefile | 6 +++---<br>
multipath/Makefile | 6 +++---<br>
multipathd/Makefile | 6 +++---<br>
6 files changed, 15 insertions(+), 16 deletions(-)<br>
<br>
diff --git a/Makefile b/Makefile<br>
index 95c7dfb..228d9ac 100644<br>
--- a/Makefile<br>
+++ b/Makefile<br>
@@ -14,6 +14,8 @@ ifeq ($(KRNLSRC),)<br>
KRNLSRC = $(KRNLLIB)/build<br>
KRNLOBJ = $(KRNLLIB)/build<br>
endif<br>
+ export KRNLSRC<br>
+ export KRNLOBJ<br>
endif<br>
<br>
ifeq ($(MULTIPATH_VERSION),)<br>
@@ -22,9 +24,6 @@ else<br>
VERSION = $(MULTIPATH_VERSION)<br>
endif<br>
<br>
-export KRNLSRC<br>
-export KRNLOBJ<br>
-<br>
BUILDDIRS = \<br>
libmpathcmd \<br>
libmultipath \<br>
diff --git a/Makefile.inc b/Makefile.inc<br>
index 0808e64..56705c4 100644<br>
--- a/Makefile.inc<br>
+++ b/Makefile.inc<br>
@@ -45,7 +45,7 @@ bindir = $(exec_prefix)/sbin<br>
libudevdir = $(prefix)/$(SYSTEMDPATH)/udev<br>
udevrulesdir = $(libudevdir)/rules.d<br>
multipathdir = $(TOPDIR)/libmultipath<br>
-mandir = $(prefix)/usr/share/man/man8<br>
+man8dir = $(prefix)/usr/share/man/man8<br>
man5dir = $(prefix)/usr/share/man/man5<br>
man3dir = $(prefix)/usr/share/man/man3<br>
syslibdir = $(prefix)/$(LIB)<br>
diff --git a/kpartx/Makefile b/kpartx/Makefile<br>
index 853288f..e8a59f2 100644<br>
--- a/kpartx/Makefile<br>
+++ b/kpartx/Makefile<br>
@@ -31,12 +31,12 @@ install: $(EXEC) $(EXEC).8<br>
$(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir)<br>
$(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir)/rules.<wbr>d<br>
$(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)$(libudevdir)/rules.<wbr>d/66-kpartx.rules<br>
- $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)<br>
- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)<br>
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)<br>
+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)<br>
<br>
uninstall:<br>
$(RM) $(DESTDIR)$(bindir)/$(EXEC)<br>
- $(RM) $(DESTDIR)$(mandir)/$(EXEC).8.<wbr>gz<br>
+ $(RM) $(DESTDIR)$(man8dir)/$(EXEC).<wbr>8.gz<br>
$(RM) $(DESTDIR)$(libudevdir)/<wbr>kpartx_id<br>
$(RM) $(DESTDIR)$(libudevdir)/rules.<wbr>d/66-kpartx.rules<br>
$(RM) $(DESTDIR)$(libudevdir)/rules.<wbr>d/67-kpartx-compat.rules<br>
diff --git a/mpathpersist/Makefile b/mpathpersist/Makefile<br>
index 7921619..47043bb 100644<br>
--- a/mpathpersist/Makefile<br>
+++ b/mpathpersist/Makefile<br>
@@ -18,12 +18,12 @@ $(EXEC): $(OBJS)<br>
install:<br>
$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)<br>
$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/<br>
- $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)<br>
- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)<br>
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)<br>
+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)<br>
<br>
clean:<br>
$(RM) core *.o $(EXEC) *.gz<br>
<br>
uninstall:<br>
$(RM) $(DESTDIR)$(bindir)/$(EXEC)<br>
- $(RM) $(DESTDIR)$(mandir)/$(EXEC).8.<wbr>gz<br>
+ $(RM) $(DESTDIR)$(man8dir)/$(EXEC).<wbr>8.gz<br>
diff --git a/multipath/Makefile b/multipath/Makefile<br>
index f296add..cad34bf 100644<br>
--- a/multipath/Makefile<br>
+++ b/multipath/Makefile<br>
@@ -25,8 +25,8 @@ install:<br>
$(INSTALL_PROGRAM) -d $(DESTDIR)$(udevrulesdir)<br>
$(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir)<br>
$(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.<wbr>d/56-multipath.rules<br>
- $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)<br>
- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)<br>
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)<br>
+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)<br>
$(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir)<br>
$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir)<br>
<br>
@@ -34,7 +34,7 @@ uninstall:<br>
$(RM) $(DESTDIR)$(bindir)/$(EXEC)<br>
$(RM) $(DESTDIR)$(udevrulesdir)/11-<wbr>dm-mpath.rules<br>
$(RM) $(DESTDIR)$(libudevdir)/rules.<wbr>d/56-multipath.rules<br>
- $(RM) $(DESTDIR)$(mandir)/$(EXEC).8.<wbr>gz<br>
+ $(RM) $(DESTDIR)$(man8dir)/$(EXEC).<wbr>8.gz<br>
$(RM) $(DESTDIR)$(man5dir)/$(EXEC).<wbr>conf.5.gz<br>
<br>
clean:<br>
diff --git a/multipathd/Makefile b/multipathd/Makefile<br>
index 8524efa..fd3d543 100644<br>
--- a/multipathd/Makefile<br>
+++ b/multipathd/Makefile<br>
@@ -39,12 +39,12 @@ ifdef SYSTEMD<br>
$(INSTALL_PROGRAM) -m 644 $(EXEC).service $(DESTDIR)$(unitdir)<br>
$(INSTALL_PROGRAM) -m 644 $(EXEC).socket $(DESTDIR)$(unitdir)<br>
endif<br>
- $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)<br>
- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)<br>
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)<br>
+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)<br>
<br>
uninstall:<br>
$(RM) $(DESTDIR)$(bindir)/$(EXEC)<br>
- $(RM) $(DESTDIR)$(mandir)/$(EXEC).8.<wbr>gz<br>
+ $(RM) $(DESTDIR)$(man8dir)/$(EXEC).<wbr>8.gz<br>
$(RM) $(DESTDIR)$(unitdir)/$(EXEC).<wbr>service<br>
$(RM) $(DESTDIR)$(unitdir)/$(EXEC).<wbr>socket<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
2.7.4<br>
<br>
</font></span></blockquote></div><br></div>