man: use configured path for /var/run/lldpd.socket

diff --git a/configure.ac b/configure.ac
index 0878ca06481c8406d9a70e3d2b9c2443b2540ad0..059fdbe51be76c1d709ce0bde8f67603f4f17202 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -22,6 +22,7 @@ AC_CONFIG_FILES([osx/Makefile osx/distribution.xml osx/im.bernat.lldpd.plist])
 AC_CONFIG_FILES([osx/scripts/preinstall], [chmod +x osx/scripts/preinstall])
 AC_CONFIG_FILES([osx/scripts/postinstall], [chmod +x osx/scripts/postinstall])
 AC_CONFIG_FILES([src/daemon/lldpd.service])
+AC_CONFIG_FILES([src/daemon/lldpd.8 src/client/lldpcli.8])
 AC_CONFIG_MACRO_DIR([m4])
 AC_SUBST([CONFIGURE_ARGS], [$ac_configure_args])
 

diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index 371d5b50f662d718c4fa6a22f3fc384410300c76..4370d85b7e2d827c82f6fc5571f961817a23a241 100644 (file)
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -1,7 +1,8 @@
 AM_CFLAGS = -I $(top_srcdir)/include
 
 sbin_PROGRAMS = lldpcli
-dist_man_MANS = lldpcli.8 lldpctl.8
+man_MANS = lldpcli.8
+dist_man_MANS = lldpctl.8
 
 install-exec-local: lldpcli
        cd $(DESTDIR)$(sbindir) && rm -f lldpctl

diff --git a/src/client/lldpcli.8 b/src/client/lldpcli.8.in
similarity index 99%
rename from src/client/lldpcli.8
rename to src/client/lldpcli.8.in
index bb22b84101c9381a88730fef8737ab7652a79bf7..bc12aaa24a391e991ce0cea4492de0e44045588c 100644 (file)
--- a/src/client/lldpcli.8
+++ b/src/client/lldpcli.8.in
@@ -637,8 +637,8 @@ command is issued.
 
 .Ed
 .Sh FILES
-.Bl -tag -width "/var/run/lldpd.socketXX" -compact
-.It /var/run/lldpd.socket
+.Bl -tag -width "@LLDPD_CTL_SOCKET@XX" -compact
+.It @LLDPD_CTL_SOCKET@
 Unix-domain socket used for communication with
 .Xr lldpd 8 .
 .El

diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index 828e0c388d8434632120d9320bc781ac61f24a24..39ba12aaff34af9a9a41ee2a4690039aacc5ed22 100644 (file)
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -3,7 +3,7 @@ BUILT_SOURCES =
 CLEANFILES =
 
 sbin_PROGRAMS = lldpd
-dist_man_MANS = lldpd.8
+man_MANS = lldpd.8
 
 noinst_LTLIBRARIES = liblldpd.la
 

diff --git a/src/daemon/lldpd.8 b/src/daemon/lldpd.8.in
similarity index 99%
rename from src/daemon/lldpd.8
rename to src/daemon/lldpd.8.in
index c62b1e7b0e8789f4084af36666bc0cf052ba7d60..70f2b94914ac2a187277224a9bb9c3fbf10a4695 100644 (file)
--- a/src/daemon/lldpd.8
+++ b/src/daemon/lldpd.8.in
@@ -362,8 +362,8 @@ column tells that only one neighbor will be kept.
 .It Em 19 Ta x Ta   Ta   Ta x Ta x Ta  
 .El
 .Sh FILES
-.Bl -tag -width "/var/run/lldpd.socketXX" -compact
-.It /var/run/lldpd.socket
+.Bl -tag -width "@LLDPD_CTL_SOCKET@XX" -compact
+.It @LLDPD_CTL_SOCKET@
 Unix-domain socket used for communication with
 .Xr lldpctl 8 .
 .It /etc/lldpd.conf