summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--6pack/Makefile.am4
-rw-r--r--ax25/Makefile.am4
-rw-r--r--ax25/axgetput/Makefile.am3
-rw-r--r--dmascc/Makefile.am6
-rw-r--r--hdlcutil/Makefile.am5
-rw-r--r--kiss/Makefile.am5
-rw-r--r--netrom/Makefile.am4
-rw-r--r--rose/Makefile.am4
-rw-r--r--tcpip/Makefile.am6
-rw-r--r--user_call/Makefile.am6
-rw-r--r--yamdrv/Makefile.am4
11 files changed, 19 insertions, 32 deletions
diff --git a/6pack/Makefile.am b/6pack/Makefile.am
index 014cfe2..2e803dd 100644
--- a/6pack/Makefile.am
+++ b/6pack/Makefile.am
@@ -5,9 +5,7 @@ sbin_PROGRAMS = m6pack
LDADD= $(AX25_LIB)
-man_MANS = m6pack.8
-
-EXTRA_DIST = $(man_MANS)
+dist_man_MANS = m6pack.8
INCLUDES = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \
-DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\"
diff --git a/ax25/Makefile.am b/ax25/Makefile.am
index f5c0ebb..b3d393e 100644
--- a/ax25/Makefile.am
+++ b/ax25/Makefile.am
@@ -29,13 +29,13 @@ INCLUDES = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \
AX25_SYSCONFDIR=$(sysconfdir)/ax25/
AX25_LOCALSTATEDIR=$(localstatedir)/ax25/
-man_MANS = ax25.4 ax25d.conf.5 axspawn.conf.5 rxecho.conf.5 \
+dist_man_MANS = ax25.4 ax25d.conf.5 axspawn.conf.5 rxecho.conf.5 \
ax25d.8 axctl.8 axparms.8 axspawn.8 beacon.8 bpqparms.8 \
mheard.1 mheardd.8 rxecho.8
-EXTRA_DIST = $(man_MANS) $(etcfiles) $(varfiles)
+EXTRA_DIST = $(etcfiles) $(varfiles)
ax25d_SOURCES = ax25d.c
axctl_SOURCES = axctl.c
diff --git a/ax25/axgetput/Makefile.am b/ax25/axgetput/Makefile.am
index d3f8f8f..8eae7cc 100644
--- a/ax25/axgetput/Makefile.am
+++ b/ax25/axgetput/Makefile.am
@@ -8,8 +8,7 @@ sbin_PROGRAMS =
bin_PROGRAMS = axgetput
-man_MANS = axgetput.1
-EXTRA_DIST = $(man_MANS)
+dist_man_MANS = axgetput.1
axgetput_SOURCES = axgetput.c axgetput.h util.h proto_bin.h util.c proto_bin.c includes.h
diff --git a/dmascc/Makefile.am b/dmascc/Makefile.am
index 45bd335..32d2378 100644
--- a/dmascc/Makefile.am
+++ b/dmascc/Makefile.am
@@ -3,11 +3,9 @@ sbin_PROGRAMS = dmascc_cfg
dmascc_cfg_SOURCE = dmascc_cfg.c
-man_MANS = dmascc_cfg.1
+dist_man_MANS = dmascc_cfg.1
-EXTRA_DIST = $(man_MANS) $(doc_DATA)
-
-doc_DATA = README.dmascc
+dist_doc_DATA = README.dmascc
installconf:
diff --git a/hdlcutil/Makefile.am b/hdlcutil/Makefile.am
index b200566..24c25af 100644
--- a/hdlcutil/Makefile.am
+++ b/hdlcutil/Makefile.am
@@ -19,7 +19,4 @@ INCLUDES = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \
AX25_SYSCONFDIR=$(sysconfdir)/ax25/
AX25_LOCALSTATEDIR=$(localstatedir)/ax25/
-man_MANS = sethdlc.8 smmixer.8 baycom.9 hdlcdrv.9 soundmodem.9 smdiag.8
-
-EXTRA_DIST = $(man_MANS)
-
+dist_man_MANS = sethdlc.8 smmixer.8 baycom.9 hdlcdrv.9 soundmodem.9 smdiag.8
diff --git a/kiss/Makefile.am b/kiss/Makefile.am
index 120afb4..dcb833a 100644
--- a/kiss/Makefile.am
+++ b/kiss/Makefile.am
@@ -5,9 +5,8 @@ sbin_PROGRAMS = kissattach kissnetd kissparms mkiss net2kiss
LDADD= $(AX25_LIB)
-man_MANS = kissattach.8 spattach.8 kissnetd.8 kissparms.8 mkiss.8 net2kiss.8
-
-EXTRA_DIST = $(man_MANS)
+dist_man_MANS = kissattach.8 spattach.8 kissnetd.8 kissparms.8 mkiss.8 \
+ net2kiss.8
INCLUDES = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \
-DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\"
diff --git a/netrom/Makefile.am b/netrom/Makefile.am
index 0678996..fc2361b 100644
--- a/netrom/Makefile.am
+++ b/netrom/Makefile.am
@@ -13,10 +13,10 @@ sbin_PROGRAMS = netromd nodesave nrattach nrparms nrsdrv
LDADD = $(AX25_LIB)
-man_MANS = netrom.4 nrbroadcast.5 netromd.8 nodesave.8 \
+dist_man_MANS = netrom.4 nrbroadcast.5 netromd.8 nodesave.8 \
nrattach.8 nrparms.8 nrsdrv.8
-EXTRA_DIST = $(man_MANS) $(etcfiles)
+EXTRA_DIST = $(etcfiles)
netromd_SOURCES = \
netromd.c \
diff --git a/rose/Makefile.am b/rose/Makefile.am
index 5596113..1729e9a 100644
--- a/rose/Makefile.am
+++ b/rose/Makefile.am
@@ -8,9 +8,9 @@ rsmemsiz_LDADD =
sbin_SCRIPTS = rsusers.sh
-man_MANS = rose.4 rsattach.8 rsparms.8 rsdwnlnk.8 rsuplnk.8
+dist_man_MANS = rose.4 rsattach.8 rsparms.8 rsdwnlnk.8 rsuplnk.8
-EXTRA_DIST = $(man_MANS) $(sbin_SCRIPTS)
+EXTRA_DIST = $(sbin_SCRIPTS)
INCLUDES = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \
-DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\"
diff --git a/tcpip/Makefile.am b/tcpip/Makefile.am
index 7a5a2cb..0362e18 100644
--- a/tcpip/Makefile.am
+++ b/tcpip/Makefile.am
@@ -10,11 +10,11 @@ installconf:
sbin_PROGRAMS = rip98d ttylinkd
-man_MANS = rip98d.conf.5 rip98d.8 ttylinkd.conf.5 ttylinkd.8
+dist_man_MANS = rip98d.conf.5 rip98d.8 ttylinkd.conf.5 ttylinkd.8
-doc_DATA= ttylinkd.README ttylinkd.INSTALL
+dist_doc_DATA = ttylinkd.README ttylinkd.INSTALL
-EXTRA_DIST = $(man_MANS) $(etcfiles) $(doc_DATA)
+EXTRA_DIST = $(etcfiles)
rip98d_SOURCES = \
rip98d.c \
diff --git a/user_call/Makefile.am b/user_call/Makefile.am
index 1911d6f..b45e47c 100644
--- a/user_call/Makefile.am
+++ b/user_call/Makefile.am
@@ -4,11 +4,9 @@ installconf:
sbin_PROGRAMS = ax25_call netrom_call rose_call tcp_call
-man_MANS = ax25_call.8 netrom_call.8 rose_call.8 tcp_call.8
+dist_man_MANS = ax25_call.8 netrom_call.8 rose_call.8 tcp_call.8
-doc_DATA= README.user_call
-
-EXTRA_DIST = $(man_MANS) $(doc_DATA)
+dist_doc_DATA= README.user_call
LDADD = $(AX25_LIB) $(Z_LIB)
diff --git a/yamdrv/Makefile.am b/yamdrv/Makefile.am
index 1a514f3..22352eb 100644
--- a/yamdrv/Makefile.am
+++ b/yamdrv/Makefile.am
@@ -5,9 +5,7 @@ yamcfg_SOURCES = yamcfg.c yam.h
mcs2h_SOURCES = mcs2h.c
-doc_DATA = README.yamdrv
-
-EXTRA_DIST = $(doc_DATA)
+dist_doc_DATA = README.yamdrv
installconf: