Fixes ticket:34. Merged r3420:3425 from jcorgan/ticket-34.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3426 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/config/grc_usrp.m4 b/config/grc_usrp.m4
index 2468ad39331798746ad2ffff7f45246be177b037..9ed197aa4c38cc7f6086987015d592f3663513dc 100644 (file)
--- a/config/grc_usrp.m4
+++ b/config/grc_usrp.m4
@@ -48,8 +48,6 @@ AC_DEFUN([GRC_USRP],[
     UTILS_FUNC_MKSTEMP
 
     # These checks don't fail
-    AC_CHECK_PROG([XMLTO],[xmlto],[yes],[])
-    AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes])
     AC_C_BIGENDIAN
     AC_CHECK_HEADERS([byteswap.h])
     AC_CHECK_FUNCS([getrusage sched_setscheduler])

diff --git a/configure.ac b/configure.ac
index 4495898b27b1ddf8f00f4dc95c93fc053c17e1a4..a5e3f514d98393ffb32f6b2815c88690db259b4c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -47,6 +47,9 @@ GR_FORTRAN
 GR_NO_UNDEFINED                dnl do we need the -no-undefined linker flag
 GR_SCRIPTING
 
+AC_CHECK_PROG([XMLTO],[xmlto],[yes],[])
+AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes])
+
 dnl Checks for libraries.
 AC_CHECK_LIB(socket,socket)
 

diff --git a/gr-trellis/Makefile.am b/gr-trellis/Makefile.am
index 8f2ded1ab60e84a1c5f0b2c4098681803fb90fb9..4eb3a10212e87704cb90827b2853230ebfe105b6 100644 (file)
--- a/gr-trellis/Makefile.am
+++ b/gr-trellis/Makefile.am
@@ -21,6 +21,5 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = src
-DIST_SUBDIRS = src doc
+SUBDIRS = src doc
 

diff --git a/gr-trellis/doc/Makefile.am b/gr-trellis/doc/Makefile.am
index 68f879b40e61d8ab736b5ebeb542971271920d95..0275a3e974b91f2f796e52a45298c6c402553557 100644 (file)
--- a/gr-trellis/doc/Makefile.am
+++ b/gr-trellis/doc/Makefile.am
@@ -19,33 +19,46 @@
 # Boston, MA 02111-1307, USA.
 # 
 
-TARGETS = gr-trellis.html
+docdir=$(prefix)/share/doc/@PACKAGE@-@VERSION@
 
+HTML_FILES =
 
-# To avoid build problems for folks who don't have xmlto installed, we
-# don't build the docs by default.
+if HAS_XMLTO
+HTML_FILES += \
+    gr-trellis.html
+endif
 
-# html: $(TARGETS)
-all: $(TARGETS)
-
-
-EXTRA_DIST =                           
+all: $(HTML_FILES)
 
+EXTRA_DIST = \
+    gr-trellis.xml \
+    make_numbered_listing.py \
+    test_tcm.py \
+    test_tcm.py.xml
 
 BUILT_XML_FILES =                      
 
-
-gr-trellis.html : gr-trellis.xml $(BUILT_XML_FILES)
-
-
-
 # ----------------------------------------------------------------
 
-clean:
-       -rm -f $(TARGETS) $(BUILT_XML_FILES)
-
 %.html : %.xml
        xmlto html-nochunks $<
 
 %.xml : % make_numbered_listing.py
        ./make_numbered_listing.py $<
+
+install-data-local:
+       mkdir -p $(DESTDIR)$(docdir)/html
+       @for i in $(HTML_FILES); do \
+               echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/html"; \
+               $(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/html; \
+       done
+
+uninstall-local:
+       @for i in $(HTML_FILES); do \
+               echo "$(RM) $(DESTDIR)$(docdir)/$$i;"; \
+               $(RM) $(DESTDIR)$(docdir)/$$i; \
+       done
+       $(RM) -fr $(DESTDIR)$(docdir)/html
+
+clean-local:
+       $(RM) -fr $(HTML_FILES) *~
\ No newline at end of file