From 2cbc9cc56219817deeda006db5c8f4bfd6e6775c Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Wed, 7 May 2014 13:31:32 +0200 Subject: [PATCH] man: use configured path for /var/run/lldpd.socket --- configure.ac | 1 + src/client/Makefile.am | 3 ++- src/client/{lldpcli.8 => lldpcli.8.in} | 4 ++-- src/daemon/Makefile.am | 2 +- src/daemon/{lldpd.8 => lldpd.8.in} | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) rename src/client/{lldpcli.8 => lldpcli.8.in} (99%) rename src/daemon/{lldpd.8 => lldpd.8.in} (99%) diff --git a/configure.ac b/configure.ac index 0878ca06..059fdbe5 100644 --- 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 371d5b50..4370d85b 100644 --- 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 bb22b841..bc12aaa2 100644 --- 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 828e0c38..39ba12aa 100644 --- 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 c62b1e7b..70f2b949 100644 --- 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 -- 2.39.5