[Commit-gnuradio] r4027 - in gnuradio/branches/releases/3.0: gr-trellis/doc usrp/doc

[jcorgan]

Author: jcorgan
Date: 2006-11-26 19:55:23 -0700 (Sun, 26 Nov 2006)
New Revision: 4027

Modified:
   gnuradio/branches/releases/3.0/gr-trellis/doc/Makefile.am
   gnuradio/branches/releases/3.0/usrp/doc/Makefile.am
Log:
Applied changesets r4018, r4020, r4022 on trunk to release branch.

Modified: gnuradio/branches/releases/3.0/gr-trellis/doc/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.0/gr-trellis/doc/Makefile.am   2006-11-27 
02:51:05 UTC (rev 4026)
+++ gnuradio/branches/releases/3.0/gr-trellis/doc/Makefile.am   2006-11-27 
02:55:23 UTC (rev 4027)
@@ -44,8 +44,8 @@
 
 # ----------------------------------------------------------------
 
-%.html : %.xml
-       xmlto html-nochunks $<
+gr-trellis.html : gr-trellis.xml
+       xmlto html-nochunks $(top_srcdir)/gr-trellis/doc/gr-trellis.xml
 
 %.xml : % make_numbered_listing.py
        ./make_numbered_listing.py $<

Modified: gnuradio/branches/releases/3.0/usrp/doc/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.0/usrp/doc/Makefile.am 2006-11-27 02:51:05 UTC 
(rev 4026)
+++ gnuradio/branches/releases/3.0/usrp/doc/Makefile.am 2006-11-27 02:55:23 UTC 
(rev 4027)
@@ -52,7 +52,7 @@
 docbook-html: usrp_guide.html
 
 usrp_guide.html: usrp_guide.xml
-       xmlto html-nochunks $<
+       xmlto html-nochunks $(top_srcdir)/usrp/doc/usrp_guide.xml
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(docdir)