[dahdi-commits] dahdi/tools.git branch "master" updated.

[SVN commits to the DAHDI project]

branch "master" has been updated
       via  98736e1add0064f654c630b5268e3a53804c503c (commit)
      from  a9338d9b743a6b7fd798b9b7581989333b888341 (commit)

Summary of changes:
 Makefile |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 98736e1add0064f654c630b5268e3a53804c503c
Author: Oron Peled <oron.peled at xorcom.com>
Date:   Sun Dec 8 15:52:26 2013 +0200

    Makefile: do install all man-pages
    
    Fixes a regression in 2.8 (ffced0ca) in the main Makefile:
    MAN_PAGES gets assigned twice and thus most man pages will not get
    installed.
    
    Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
    Acked-by: Russ Meyerriecks <rmeyerriecks at digium.com>

diff --git a/Makefile b/Makefile
index 86213f5..4766300 100644
--- a/Makefile
+++ b/Makefile
@@ -107,8 +107,9 @@ ASSIGNED_DATA_SCRIPTS:=dahdi_handle_device dahdi_span_config
 ASSIGNED_UTILS:=dahdi_span_assignments dahdi_span_types
 ASSIGNED_CONF:=assigned-spans.conf.sample span-types.conf.sample
 
-MAN_PAGES:=$(wildcard $(BINS:%=doc/%.8))
-MAN_PAGES:=$(wildcard $(ASSIGNED_UTILS:%=doc/%.8))
+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:

-----------------------------------------------------------------------


-- 
dahdi/tools.git