diff options
author | Sebastien Helleu <flashcode@flashtux.org> | 2006-12-02 10:16:20 +0000 |
---|---|---|
committer | Sebastien Helleu <flashcode@flashtux.org> | 2006-12-02 10:16:20 +0000 |
commit | 015a9d0a22bc3783654a28854b698cdcdd5595c5 (patch) | |
tree | 2d3925ff2ce798f41e1b495130ef67f7f81e52d9 | |
parent | 875d1e5feef1c23dbd0d170d6171c3ee927a37ba (diff) | |
download | weechat-015a9d0a22bc3783654a28854b698cdcdd5595c5.zip |
Added doc formats in ./configure output, fixed problem with make install when pdf are not built
-rw-r--r-- | configure.in | 11 | ||||
-rw-r--r-- | doc/de/Makefile.am | 2 | ||||
-rw-r--r-- | doc/en/Makefile.am | 2 | ||||
-rw-r--r-- | doc/fr/Makefile.am | 2 | ||||
-rw-r--r-- | weechat/configure.in | 11 | ||||
-rw-r--r-- | weechat/doc/de/Makefile.am | 2 | ||||
-rw-r--r-- | weechat/doc/en/Makefile.am | 2 | ||||
-rw-r--r-- | weechat/doc/fr/Makefile.am | 2 |
8 files changed, 28 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 2a8f8e045..68a125aa9 100644 --- a/configure.in +++ b/configure.in @@ -658,6 +658,12 @@ fi # documentation # ------------------------------------------------------------------------------ +msg_doc="" + +if test "x$DBLATEX_FOUND" = "xyes"; then + msg_doc="pdf $msg_doc" +fi + AC_MSG_CHECKING(for html/chunk.xsl) DOC_XSL_PREFIX="" @@ -676,7 +682,6 @@ done if test "x$DOC_XSL_PREFIX" = "x"; then AC_MSG_RESULT(no) - enable_doc="no" AC_MSG_WARN([ *** Docbook XSL files not found *** WeeChat will be built without documentation. @@ -684,7 +689,7 @@ if test "x$DOC_XSL_PREFIX" = "x"; then else AC_MSG_RESULT($DOC_XSL_PREFIX) AC_SUBST(DOC_XSL_PREFIX) - enable_doc="yes" + msg_doc="html $msg_doc" fi # ------------------------------------------------------------------------------ @@ -883,7 +888,7 @@ echo " Aspell plugin....... : $enable_aspell" echo " Charset plugin...... : $enable_charset" echo "Compile with debug info........... : $msg_debug_compiler" echo " Backtrace........... : $enable_backtrace" -echo "Build doc..........................: $enable_doc" +echo "Build doc..........................: $msg_doc" echo "Print debugging messages.......... : $msg_debug_verbose" echo "" eval echo "WeeChat will be installed in $bindir." diff --git a/doc/de/Makefile.am b/doc/de/Makefile.am index f3a12304d..cd62da660 100644 --- a/doc/de/Makefile.am +++ b/doc/de/Makefile.am @@ -67,7 +67,9 @@ install-data-hook: $(mkinstalldirs) $(DESTDIR)$(docdir)/html/$(LANGCODE)/ $(INSTALL_DATA) html/* $(DESTDIR)$(docdir)/html/$(LANGCODE)/ $(INSTALL_DATA) $(QUICKSTART) $(DESTDIR)$(docdir)/ +if DBLATEX_FOUND $(INSTALL_DATA) $(BOOK).pdf $(DESTDIR)$(docdir)/ +endif # clean diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am index aba7aa0d9..24cd5f2fd 100644 --- a/doc/en/Makefile.am +++ b/doc/en/Makefile.am @@ -67,7 +67,9 @@ install-data-hook: $(mkinstalldirs) $(DESTDIR)$(docdir)/html/$(LANGCODE)/ $(INSTALL_DATA) html/* $(DESTDIR)$(docdir)/html/$(LANGCODE)/ $(INSTALL_DATA) $(QUICKSTART) $(DESTDIR)$(docdir)/ +if DBLATEX_FOUND $(INSTALL_DATA) $(BOOK).pdf $(DESTDIR)$(docdir)/ +endif # clean diff --git a/doc/fr/Makefile.am b/doc/fr/Makefile.am index 7e30b92f8..c696983a5 100644 --- a/doc/fr/Makefile.am +++ b/doc/fr/Makefile.am @@ -67,7 +67,9 @@ install-data-hook: $(mkinstalldirs) $(DESTDIR)$(docdir)/html/$(LANGCODE)/ $(INSTALL_DATA) html/* $(DESTDIR)$(docdir)/html/$(LANGCODE)/ $(INSTALL_DATA) $(QUICKSTART) $(DESTDIR)$(docdir)/ +if DBLATEX_FOUND $(INSTALL_DATA) $(BOOK).pdf $(DESTDIR)$(docdir)/ +endif # clean diff --git a/weechat/configure.in b/weechat/configure.in index 2a8f8e045..68a125aa9 100644 --- a/weechat/configure.in +++ b/weechat/configure.in @@ -658,6 +658,12 @@ fi # documentation # ------------------------------------------------------------------------------ +msg_doc="" + +if test "x$DBLATEX_FOUND" = "xyes"; then + msg_doc="pdf $msg_doc" +fi + AC_MSG_CHECKING(for html/chunk.xsl) DOC_XSL_PREFIX="" @@ -676,7 +682,6 @@ done if test "x$DOC_XSL_PREFIX" = "x"; then AC_MSG_RESULT(no) - enable_doc="no" AC_MSG_WARN([ *** Docbook XSL files not found *** WeeChat will be built without documentation. @@ -684,7 +689,7 @@ if test "x$DOC_XSL_PREFIX" = "x"; then else AC_MSG_RESULT($DOC_XSL_PREFIX) AC_SUBST(DOC_XSL_PREFIX) - enable_doc="yes" + msg_doc="html $msg_doc" fi # ------------------------------------------------------------------------------ @@ -883,7 +888,7 @@ echo " Aspell plugin....... : $enable_aspell" echo " Charset plugin...... : $enable_charset" echo "Compile with debug info........... : $msg_debug_compiler" echo " Backtrace........... : $enable_backtrace" -echo "Build doc..........................: $enable_doc" +echo "Build doc..........................: $msg_doc" echo "Print debugging messages.......... : $msg_debug_verbose" echo "" eval echo "WeeChat will be installed in $bindir." diff --git a/weechat/doc/de/Makefile.am b/weechat/doc/de/Makefile.am index f3a12304d..cd62da660 100644 --- a/weechat/doc/de/Makefile.am +++ b/weechat/doc/de/Makefile.am @@ -67,7 +67,9 @@ install-data-hook: $(mkinstalldirs) $(DESTDIR)$(docdir)/html/$(LANGCODE)/ $(INSTALL_DATA) html/* $(DESTDIR)$(docdir)/html/$(LANGCODE)/ $(INSTALL_DATA) $(QUICKSTART) $(DESTDIR)$(docdir)/ +if DBLATEX_FOUND $(INSTALL_DATA) $(BOOK).pdf $(DESTDIR)$(docdir)/ +endif # clean diff --git a/weechat/doc/en/Makefile.am b/weechat/doc/en/Makefile.am index aba7aa0d9..24cd5f2fd 100644 --- a/weechat/doc/en/Makefile.am +++ b/weechat/doc/en/Makefile.am @@ -67,7 +67,9 @@ install-data-hook: $(mkinstalldirs) $(DESTDIR)$(docdir)/html/$(LANGCODE)/ $(INSTALL_DATA) html/* $(DESTDIR)$(docdir)/html/$(LANGCODE)/ $(INSTALL_DATA) $(QUICKSTART) $(DESTDIR)$(docdir)/ +if DBLATEX_FOUND $(INSTALL_DATA) $(BOOK).pdf $(DESTDIR)$(docdir)/ +endif # clean diff --git a/weechat/doc/fr/Makefile.am b/weechat/doc/fr/Makefile.am index 7e30b92f8..c696983a5 100644 --- a/weechat/doc/fr/Makefile.am +++ b/weechat/doc/fr/Makefile.am @@ -67,7 +67,9 @@ install-data-hook: $(mkinstalldirs) $(DESTDIR)$(docdir)/html/$(LANGCODE)/ $(INSTALL_DATA) html/* $(DESTDIR)$(docdir)/html/$(LANGCODE)/ $(INSTALL_DATA) $(QUICKSTART) $(DESTDIR)$(docdir)/ +if DBLATEX_FOUND $(INSTALL_DATA) $(BOOK).pdf $(DESTDIR)$(docdir)/ +endif # clean |