[Pkg-voip-commits] [dahdi-tools] 236/285: automake: handle doc/ man-pages
tzafrir at debian.org
tzafrir at debian.org
Thu Jul 7 19:19:04 UTC 2016
This is an automated email from the git hooks/post-receive script.
tzafrir pushed a commit to branch master
in repository dahdi-tools.
commit 703db3bcc3be9ecb1590d88b5b0dc3035f0b2e62
Author: Oron Peled <oron.peled at xorcom.com>
Date: Sun Dec 21 09:52:38 2014 -0500
automake: handle doc/ man-pages
* 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 at xorcom.com>
---
Makefile.am | 2 +-
Makefile.legacy | 7 -------
build_tools/make_dist | 2 ++
configure.ac | 1 +
doc/Makefile.am | 17 +++++++++++++++++
5 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index fe4e28f..ef38b0a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ LEGACY_MAKE = \
top_srcdir=$(top_srcdir) \
srcdir=$(srcdir)
-SUBDIRS = xpp
+SUBDIRS = xpp doc
if PPPD
SUBDIRS += ppp
diff --git a/Makefile.legacy b/Makefile.legacy
index 98303c5..b8b5070 100644
--- a/Makefile.legacy
+++ b/Makefile.legacy
@@ -80,7 +80,6 @@ LTZ_SO_MINOR_VER:=0
BIN_DIR:=$(sbindir)
LIB_DIR:=$(libdir)
INC_DIR:=$(includedir)/dahdi
-MAN_DIR:=$(mandir)/man8
DATA_DIR:=${datadir}/dahdi
CONFIG_DIR:=$(sysconfdir)/dahdi
CONFIG_FILE:=$(CONFIG_DIR)/system.conf
@@ -116,10 +115,6 @@ ASSIGNED_UTILS:=dahdi_span_assignments dahdi_span_types \
dahdi_waitfor_span_assignments
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
# All the man pages. Not just installed ones:
GROFF_PAGES := $(wildcard doc/*.8 xpp/*.8)
@@ -220,8 +215,6 @@ install-utils: utils
ifneq (,$(BINS))
install -d $(DESTDIR)$(BIN_DIR)
install $(BINS) $(DESTDIR)$(BIN_DIR)/
- install -d $(DESTDIR)$(MAN_DIR)
- install -m 644 $(MAN_PAGES) $(DESTDIR)$(MAN_DIR)/
endif
ifeq (,$(wildcard $(DESTDIR)$(CONFIG_FILE)))
$(INSTALL) -d $(DESTDIR)$(CONFIG_DIR)
diff --git a/build_tools/make_dist b/build_tools/make_dist
index e1e580c..9a2ba07 100755
--- a/build_tools/make_dist
+++ b/build_tools/make_dist
@@ -24,11 +24,13 @@ echo "$version" > "$tmp_version_dir/.version"
extra_dist='
autoconfig.h.in
configure
+ doc/Makefile
ppp/Makefile
Makefile
xpp/Makefile
xpp/oct612x/Makefile
xpp/perl_modules/Makefile
+ doc/Makefile.in
ppp/Makefile.in
Makefile.in
xpp/Makefile.in
diff --git a/configure.ac b/configure.ac
index 796410b..6ed7c64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -256,6 +256,7 @@ AC_CONFIG_FILES([
makeopts
version.c
Makefile
+ doc/Makefile
ppp/Makefile
xpp/Makefile
xpp/oct612x/Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 0000000..8518b4a
--- /dev/null
+++ b/doc/Makefile.am
@@ -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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/dahdi-tools.git
More information about the Pkg-voip-commits
mailing list