[zaptel-commits] tzafrir: branch 1.4 r2998 - in /branches/1.4: ./ Makefile xpp/

[SVN commits to the Zaptel project]

Author: tzafrir
Date: Sat Sep  8 06:48:51 2007
New Revision: 2998

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2998
Log:
Allow overriding the asciidoc command. This allows using asciidoc < 7.

Merged revisions 2997 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

Modified:
    branches/1.4/   (props changed)
    branches/1.4/Makefile
    branches/1.4/xpp/   (props changed)

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/Makefile?view=diff&rev=2998&r1=2997&r2=2998
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Sat Sep  8 06:48:51 2007
@@ -239,6 +239,7 @@
 UTILS		= tor2ee zttool zttest ztmonitor ztspeed sethdlc-new ztcfg \
 		  ztcfg-dude usbfxstest fxstest fxotune ztdiag torisatool
 
+
 # Makefile mentions them. Source is not included (anynore?)
 UTILS		+= fxsdump ztprovision
 
@@ -251,6 +252,8 @@
 BINS:=fxotune fxstest sethdlc-new ztcfg ztdiag ztmonitor ztspeed zttest zttool
 BINS:=$(filter-out $(MENUSELECT_UTILS),$(BINS))
 MAN_PAGES:=$(wildcard $(BINS:%=doc/%.8))
+
+ASCIIDOC	:= asciidoc
 
 all: menuselect.makeopts 
 	@$(MAKE) _all
@@ -404,10 +407,10 @@
 	./checkstack *.ko */*.ko
 
 README.html: README
-	asciidoc -n -a toc $<
+	$(ASCIIDOC) -n -a toc $<
 
 xpp/README.Astribank.html: xpp/README.Astribank
-	cd $(@D); asciidoc -o $(@F) -n -a toc $(<F)
+	cd $(@D); $(ASCIIDOC) -o $(@F) -n -a toc $(<F)
 
 MISDNVERSION=1_1_3
 MISDNUSERVERSION=1_1_3

Propchange: branches/1.4/xpp/
            ('svk:merge' removed)

Propchange: branches/1.4/xpp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Sep  8 06:48:51 2007
@@ -6,4 +6,4 @@
 .tmp_versions
 .*.swp
 xpp_version.h
-README.html
+README.Astribank.html