[asterisk-commits] russell: trunk r58938 - in /trunk: ./ Makefile doc/asterisk.tex

[asterisk-commits at lists.digium.com]

Author: russell
Date: Thu Mar 15 17:52:27 2007
New Revision: 58938

URL: http://svn.digium.com/view/asterisk?view=rev&rev=58938
Log:
Merged revisions 58937 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r58937 | russell | 2007-03-15 17:51:29 -0500 (Thu, 15 Mar 2007) | 2 lines

Add Asterisk version information to the generated PDF

........

Modified:
    trunk/   (props changed)
    trunk/Makefile
    trunk/doc/asterisk.tex

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

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?view=diff&rev=58938&r1=58937&r2=58938
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Mar 15 17:52:27 2007
@@ -686,7 +686,7 @@
 
 asterisk.pdf: doc/asterisk.pdf
 
-doc/asterisk.pdf:
+doc/asterisk.pdf: $(wildcard doc/*.tex)
 ifeq ($(findstring rubber,$(RUBBER)),)
 	@echo "**********************************************"
 	@echo "** You must install the \"rubber\" tool      ***"
@@ -698,7 +698,10 @@
 	@echo "** generated.  When complete, it will be   ***"
 	@echo "** located at doc/asterisk.pdf.            ***"	
 	@echo "**********************************************"
-	@cd doc && rubber asterisk.tex
+	@cp doc/asterisk.tex doc/asterisk.tex.orig
+	@sed -i -e 's/ASTERISKVERSION/$(ASTERISKVERSION)/' doc/asterisk.tex
+	@cd doc && $(RUBBER) --pdf asterisk.tex
+	@mv doc/asterisk.tex.orig doc/asterisk.tex
 endif
 
 .PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS)

Modified: trunk/doc/asterisk.tex
URL: http://svn.digium.com/view/asterisk/trunk/doc/asterisk.tex?view=diff&rev=58938&r1=58937&r2=58938
==============================================================================
--- trunk/doc/asterisk.tex (original)
+++ trunk/doc/asterisk.tex Thu Mar 15 17:52:27 2007
@@ -7,7 +7,7 @@
 \usepackage{hyperref}
 
 \author{Asterisk Development Team \\ Asterisk.org}
-\title{Asterisk Reference Information}
+\title{Asterisk Reference Information \\ Version ASTERISKVERSION}
 
 \begin{document}
 \maketitle