Revision: 1901
http://geeqie.svn.sourceforge.net/geeqie/?rev=1901&view=rev
Author: nadvornik
Date: 2010-02-07 13:16:35 +0000 (Sun, 07 Feb 2010)
Log Message:
-----------
test gnome-doc-tool in configure
Modified Paths:
--------------
trunk/configure.in
trunk/doc/Makefile.am
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2010-02-07 12:44:55 UTC (rev 1900)
+++ trunk/configure.in 2010-02-07 13:16:35 UTC (rev 1901)
@@ -218,6 +218,8 @@
AC_DEFINE_UNQUOTED(GQ_HELPDIR, "$readmedir", [Location of documentation files])
AC_DEFINE_UNQUOTED(GQ_HTMLDIR, "$htmldir", [Location of html documentation])
+AC_PATH_PROG(GNOME_DOC_TOOL, gnome-doc-tool)
+
AC_SUBST(readmedir)
AC_SUBST(htmldir)
@@ -469,6 +471,8 @@
Documentation:
Doxygen: $DOXYGEN
Formats: $doxy_formats_report
+ doc-tool: $GNOME_DOC_TOOL
+
END
cat config.report
Modified: trunk/doc/Makefile.am
===================================================================
--- trunk/doc/Makefile.am 2010-02-07 12:44:55 UTC (rev 1900)
+++ trunk/doc/Makefile.am 2010-02-07 13:16:35 UTC (rev 1901)
@@ -8,13 +8,20 @@
EXTRA_DIST = docbook2html.sh docbook
html/GuideIndex.html: docbook/GuideIndex.xml
- rm -rf html; mkdir html && gnome-doc-tool html -o html
$(srcdir)/docbook/GuideIndex.xml
+ rm -rf html; mkdir html
+ if [ -x "$(GNOME_DOC_TOOL)" ]; then \
+ "$(GNOME_DOC_TOOL)" html -o html
$(srcdir)/docbook/GuideIndex.xml ; \
+ else \
+ echo "gnome-doc-tool not found, html is not built" ; \
+ fi
html: html/GuideIndex.html
install-data-hook: html
- cd html; for f in * ; do $(INSTALL_DATA) "$$f"
"$(DESTDIR)$(helpdir)/$$f" ; done
- ln -s GuideIndex.html "$(DESTDIR)$(helpdir)/index.html"
+ if [ -x "$(GNOME_DOC_TOOL)" ]; then \
+ cd html; for f in * ; do $(INSTALL_DATA) "$$f"
"$(DESTDIR)$(helpdir)/$$f" ; done; \
+ ln -s GuideIndex.html "$(DESTDIR)$(helpdir)/index.html" ; \
+ fi
uninstall-hook:
rm "$(DESTDIR)$(helpdir)/"*
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Geeqie-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
