From 595119406bba73250a2178c47fccade88f604f90 Mon Sep 17 00:00:00 2001 From: Rafael Antognolli Date: Mon, 13 Jun 2011 18:44:46 +0000 Subject: [PATCH] e: fix doc build when srcdir != builddir. SVN revision: 60293 --- configure.ac | 1 + doc/{Doxyfile => Doxyfile.in} | 10 +++++----- doc/Makefile.am | 8 ++++---- 3 files changed, 10 insertions(+), 9 deletions(-) rename doc/{Doxyfile => Doxyfile.in} (94%) diff --git a/configure.ac b/configure.ac index 95e97b2bc..4fdc5f119 100644 --- a/configure.ac +++ b/configure.ac @@ -874,6 +874,7 @@ data/etc/sysactions.conf data/icons/Makefile data/backgrounds/Makefile doc/Makefile +doc/Doxyfile doc/e.dox config/Makefile config/default/Makefile diff --git a/doc/Doxyfile b/doc/Doxyfile.in similarity index 94% rename from doc/Doxyfile rename to doc/Doxyfile.in index 240470297..7358e31d6 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile.in @@ -1,15 +1,15 @@ PROJECT_NAME = Enlightenment PROJECT_NUMBER = OUTPUT_DIRECTORY = . -INPUT = ./e.dox ../src/bin -IMAGE_PATH = img +INPUT = e.dox @top_srcdir@/src/bin +IMAGE_PATH = @srcdir@/img OUTPUT_LANGUAGE = English GENERATE_HTML = YES HTML_OUTPUT = html HTML_FILE_EXTENSION = .html -HTML_HEADER = head.html -HTML_FOOTER = foot.html -HTML_STYLESHEET = e.css +HTML_HEADER = @srcdir@/head.html +HTML_FOOTER = @srcdir@/foot.html +HTML_STYLESHEET = @srcdir@/e.css HTML_ALIGN_MEMBERS = YES ENUM_VALUES_PER_LINE = 1 GENERATE_HTMLHELP = NO diff --git a/doc/Makefile.am b/doc/Makefile.am index 1855b3703..29cd760c4 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -7,18 +7,18 @@ PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc if EFL_BUILD_DOC doc-clean: - rm -rf html/ latex/ man/ xml/ $(PACKAGE_DOCNAME).tar* + rm -rf html/ latex/ man/ xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar* doc: all doc-clean $(efl_doxygen) - cp img/* html/ + cp $(srcdir)/img/* html/ rm -rf $(PACKAGE_DOCNAME).tar* mkdir -p $(PACKAGE_DOCNAME)/doc cp -R html/ latex/ man/ $(PACKAGE_DOCNAME)/doc tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/ bzip2 -9 $(PACKAGE_DOCNAME).tar rm -rf $(PACKAGE_DOCNAME)/ - mv $(PACKAGE_DOCNAME).tar.bz2 $(top_srcdir) + mv $(PACKAGE_DOCNAME).tar.bz2 $(top_builddir) clean-local: doc-clean @@ -38,4 +38,4 @@ cache.txt \ enlightenment.png \ illume2.png -EXTRA_DIST = $(files_DATA) Doxyfile $(wildcard img/*.*) e.css head.html foot.html e.dox.in +EXTRA_DIST = $(files_DATA) Doxyfile.in $(wildcard img/*.*) e.css head.html foot.html e.dox.in