automake: handle doc/ man-pages
authorOron Peled <oron.peled@xorcom.com>
Sun, 21 Dec 2014 14:52:38 +0000 (09:52 -0500)
committerTzafrir Cohen <tzafrir.cohen@xorcom.com>
Tue, 19 May 2015 16:54:11 +0000 (19:54 +0300)
* 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>

Makefile.am
Makefile.legacy
build_tools/make_dist
configure.ac
doc/Makefile.am [new file with mode: 0644]

index fe4e28f..ef38b0a 100644 (file)
@@ -5,7 +5,7 @@ LEGACY_MAKE     = \
                top_srcdir=$(top_srcdir) \
                srcdir=$(srcdir)
 
-SUBDIRS        = xpp
+SUBDIRS        = xpp doc
 
 if PPPD
 SUBDIRS        += ppp
index 98303c5..b8b5070 100644 (file)
@@ -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)
index e1e580c..9a2ba07 100755 (executable)
@@ -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
index 796410b..6ed7c64 100644 (file)
@@ -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 (file)
index 0000000..8518b4a
--- /dev/null
@@ -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