[Commit-gnuradio] r9368 - in gnuradio/branches/developers/jblum/grc: config grc/data

[jblum]

Author: jblum
Date: 2008-08-21 17:51:49 -0600 (Thu, 21 Aug 2008)
New Revision: 9368

Modified:
   gnuradio/branches/developers/jblum/grc/config/gr_doxygen.m4
   gnuradio/branches/developers/jblum/grc/grc/data/Makefile.common
Log:
removed doxygen config options

Modified: gnuradio/branches/developers/jblum/grc/config/gr_doxygen.m4
===================================================================
--- gnuradio/branches/developers/jblum/grc/config/gr_doxygen.m4 2008-08-21 
22:40:08 UTC (rev 9367)
+++ gnuradio/branches/developers/jblum/grc/config/gr_doxygen.m4 2008-08-21 
23:51:49 UTC (rev 9368)
@@ -24,16 +24,6 @@
                AC_HELP_STRING([--enable-doxygen],
                               [enable documentation generation with doxygen 
(no)]))
   AC_ARG_ENABLE(dot, AC_HELP_STRING([--enable-dot],[use 'dot' to generate 
graphs in doxygen (auto)]))
-  AC_ARG_ENABLE(xml-docs,
-                AC_HELP_STRING([--enable-xml-docs],[enable XML generation with 
doxygen (default: yes)]),
-                [ enable_xml_docs=NO], [ enable_xml_docs=YES])
-  AC_ARG_ENABLE(html-docs,
-                AC_HELP_STRING([--enable-html-docs],[enable HTML generation 
with doxygen (default: yes)]),
-                [ enable_html_docs=NO], [ enable_html_docs=YES])
-  AC_ARG_ENABLE(latex-docs,
-                AC_HELP_STRING([--enable-latex-docs],
-                              [enable LaTeX doc generation with doxygen 
(default: no)]),
-                [ enable_latex_docs=YES], [ enable_latex_docs=NO])
 
   if test "x$enable_doxygen" = xyes; then
         AC_PATH_PROG(DOXYGEN, doxygen, , $PATH)
@@ -63,8 +53,8 @@
         enable_dot=yes
   fi
   AC_SUBST(enable_dot)
-  AC_SUBST(enable_xml_docs)
-  AC_SUBST(enable_html_docs)
-  AC_SUBST(enable_latex_docs)
+  AC_SUBST(enable_xml_docs, YES)
+  AC_SUBST(enable_html_docs, YES)
+  AC_SUBST(enable_latex_docs, NO)
   AC_SUBST(generate_docs)
 ])

Modified: gnuradio/branches/developers/jblum/grc/grc/data/Makefile.common
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/data/Makefile.common     
2008-08-21 22:40:08 UTC (rev 9367)
+++ gnuradio/branches/developers/jblum/grc/grc/data/Makefile.common     
2008-08-21 23:51:49 UTC (rev 9368)
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-grc_data_prefix = $(prefix)/share/${PACKAGE}/grc
+grc_data_prefix = @datadir@/${PACKAGE}/grc
 
 install-data-local:
        $(mkinstalldirs) $(datadir)