FGCOM/dahdi-tools
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

automake: handle doc/ man-pages

Browse Source 
* Install via doc/Makefile.am
* Remove relevant code from Makefile.legacy
* For now, leave the conversion to HTML in Makefile.legacy

Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
This commit is contained in:
Oron Peled 2014-12-21 09:52:38 -05:00 committed by Tzafrir Cohen
parent b5b32a438f
commit 703db3bcc3
5 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -5,7 +5,7 @@ LEGACY_MAKE = \
top_srcdir=$(top_srcdir) \ top_srcdir=$(top_srcdir) \
srcdir=$(srcdir) srcdir=$(srcdir)
SUBDIRS = xpp SUBDIRS = xpp doc
if PPPD if PPPD
SUBDIRS += ppp SUBDIRS += ppp

7
Makefile.legacy
View File

@ -80,7 +80,6 @@ LTZ_SO_MINOR_VER:=0
BIN_DIR:=$(sbindir) BIN_DIR:=$(sbindir)
LIB_DIR:=$(libdir) LIB_DIR:=$(libdir)
INC_DIR:=$(includedir)/dahdi INC_DIR:=$(includedir)/dahdi
MAN_DIR:=$(mandir)/man8
DATA_DIR:=${datadir}/dahdi DATA_DIR:=${datadir}/dahdi
CONFIG_DIR:=$(sysconfdir)/dahdi CONFIG_DIR:=$(sysconfdir)/dahdi
CONFIG_FILE:=$(CONFIG_DIR)/system.conf CONFIG_FILE:=$(CONFIG_DIR)/system.conf
@ -116,10 +115,6 @@ ASSIGNED_UTILS:=dahdi_span_assignments dahdi_span_types \
dahdi_waitfor_span_assignments dahdi_waitfor_span_assignments
ASSIGNED_CONF:=assigned-spans.conf.sample span-types.conf.sample ASSIGNED_CONF:=assigned-spans.conf.sample span-types.conf.sample
MAN_PAGES:= \
$(wildcard $(BINS:%=doc/%.8)) \
$(wildcard $(ASSIGNED_UTILS:%=doc/%.8))
TEST_BINS:=patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest dahdi_maint TEST_BINS:=patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest dahdi_maint
# All the man pages. Not just installed ones: # All the man pages. Not just installed ones:
GROFF_PAGES := $(wildcard doc/*.8 xpp/*.8) GROFF_PAGES := $(wildcard doc/*.8 xpp/*.8)
@ -220,8 +215,6 @@ install-utils: utils
ifneq (,$(BINS)) ifneq (,$(BINS))
install -d $(DESTDIR)$(BIN_DIR) install -d $(DESTDIR)$(BIN_DIR)
install $(BINS) $(DESTDIR)$(BIN_DIR)/ install $(BINS) $(DESTDIR)$(BIN_DIR)/
install -d $(DESTDIR)$(MAN_DIR)
install -m 644 $(MAN_PAGES) $(DESTDIR)$(MAN_DIR)/
endif endif
ifeq (,$(wildcard $(DESTDIR)$(CONFIG_FILE))) ifeq (,$(wildcard $(DESTDIR)$(CONFIG_FILE)))
$(INSTALL) -d $(DESTDIR)$(CONFIG_DIR) $(INSTALL) -d $(DESTDIR)$(CONFIG_DIR)

2
build_tools/make_dist
View File

@ -24,11 +24,13 @@ echo "$version" > "$tmp_version_dir/.version"
extra_dist=' extra_dist='
autoconfig.h.in autoconfig.h.in
configure configure
doc/Makefile
ppp/Makefile ppp/Makefile
Makefile Makefile
xpp/Makefile xpp/Makefile
xpp/oct612x/Makefile xpp/oct612x/Makefile
xpp/perl_modules/Makefile xpp/perl_modules/Makefile
doc/Makefile.in
ppp/Makefile.in ppp/Makefile.in
Makefile.in Makefile.in
xpp/Makefile.in xpp/Makefile.in

1
configure.ac
View File

@ -256,6 +256,7 @@ AC_CONFIG_FILES([
makeopts makeopts
version.c version.c
Makefile Makefile
doc/Makefile
ppp/Makefile ppp/Makefile
xpp/Makefile xpp/Makefile
xpp/oct612x/Makefile xpp/oct612x/Makefile

17
doc/Makefile.am Normal file
View File

@ -0,0 +1,17 @@
man_MANS = \
dahdi_cfg.8 \
dahdi_maint.8 \
dahdi_monitor.8 \
dahdi_scan.8 \
dahdi_span_assignments.8 \
dahdi_span_types.8 \
dahdi_test.8 \
dahdi_tool.8 \
dahdi_waitfor_span_assignments.8 \
fxotune.8
noinst_MANS = \
dahdi_diag.8 \
fxstest.8 \
patgen.8 \
pattest.8