Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Fri, 29 Aug 2014 15:07:08 UTC Commit: d2ce3d6fa11223a636483b517a545d8d55975ea2 https://github.com/geany/geany/commit/d2ce3d6fa11223a636483b517a545d8d55975e...
Log Message: ----------- Merge branch 'doc/untrack-geany.html'
Modified Paths: -------------- doc/Makefile.am m4/geany-docutils.m4
Modified: doc/Makefile.am 10 lines changed, 9 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,6 @@ man_MANS=geany.1
+if INSTALL_HTML_DOCS htmldocimagesdir = $(docdir)/html/images dist_htmldocimages_DATA = \ images/build_menu_commands_dialog.png \ @@ -23,6 +24,7 @@ dist_htmldocimages_DATA = \ images/pref_dialog_various.png \ images/pref_dialog_vte.png \ images/replace_dialog.png +endif
doc_DATA = \ $(top_srcdir)/AUTHORS \ @@ -112,7 +114,13 @@ uninstall-local:
# manually install some files under another name install-data-local: +if INSTALL_HTML_DOCS $(mkinstalldirs) $(DOCDIR)/html - $(INSTALL_DATA) $(srcdir)/geany.html $(DOCDIR)/html/index.html +# as we don't install with the automated mechanism so we can rename the file, +# we need to find the source file in the right location (either builddir or srcdir) + dir=$(builddir); test -f "$$dir/geany.html" || dir=$(srcdir); \ + $(INSTALL_DATA) "$$dir/geany.html" $(DOCDIR)/html/index.html +endif + $(mkinstalldirs) $(DOCDIR) $(INSTALL_DATA) $(srcdir)/geany.txt $(DOCDIR)/manual.txt $(INSTALL_DATA) $(top_srcdir)/scintilla/License.txt $(DOCDIR)/ScintillaLicense.txt
Modified: m4/geany-docutils.m4 8 lines changed, 7 insertions(+), 1 deletions(-) =================================================================== @@ -14,10 +14,14 @@ AC_DEFUN([GEANY_CHECK_DOCUTILS_HTML], [ AC_REQUIRE([GEANY_CHECK_REVISION])
+ AS_IF([test -f "$srcdir/doc/geany.html"], + [have_prebuilt_html_docs=yes], + [have_prebuilt_html_docs=no]) + dnl we require rst2html by default unless we don't build from Git dnl and already have the HTML manual built in-tree html_docs_default=yes - AS_IF([test "$REVISION" = "-1" && test -f "$srcdir/doc/geany.html"], + AS_IF([test "$REVISION" = "-1" && test "x$have_prebuilt_html_docs" = xyes], [html_docs_default=auto])
AC_ARG_ENABLE([html-docs], @@ -40,6 +44,8 @@ but you then may not have a local copy of the HTML manual.])], [geany_enable_html_docs="no"]) ]) AM_CONDITIONAL([WITH_RST2HTML], [test "x$geany_enable_html_docs" != "xno"]) + AM_CONDITIONAL([INSTALL_HTML_DOCS], [test "x$geany_enable_html_docs" != "xno" || + test "x$have_prebuilt_html_docs" = xyes]) GEANY_STATUS_ADD([Build HTML documentation], [$geany_enable_html_docs]) ]) dnl
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).