From 72fdc8ed09ca82008c57b7bc8a090d25332def37 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 14 Feb 2013 17:30:09 +0000 Subject: yocto-docs: Fixup a couple of merge issues Signed-off-by: Richard Purdie --- documentation/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'documentation/Makefile') diff --git a/documentation/Makefile b/documentation/Makefile index 5272ee58bd..c3c6a3c7e3 100644 --- a/documentation/Makefile +++ b/documentation/Makefile @@ -209,7 +209,7 @@ ifeq ($(DOC),ref-manual) XSLTOPTS = --xinclude ALLPREQ = html pdf eclipse tarball TARFILES = ref-manual.html ref-style.css figures/poky-title.png \ - figures/buildhistory.png figures/buildhistory-web.png eclipse + figures/buildhistory.png figures/buildhistory-web.png eclipse MANUALS = $(DOC)/$(DOC).html $(DOC)/$(DOC).pdf $(DOC)/eclipse FIGURES = figures STYLESHEET = $(DOC)/*.css @@ -245,8 +245,9 @@ TARFILES = profile-manual.html profile-manual.pdf profile-manual-style.css \ figures/perf-wget-g-copy-to-user-expanded-stripped-unresolved-hidden.png figures/pybootchartgui-linux-yocto.png \ figures/pychart-linux-yocto-rpm.png figures/pychart-linux-yocto-rpm-nostrip.png \ figures/sched-wakeup-profile.png figures/sysprof-callers.png \ - figures/sysprof-copy-from-user.png figures/sysprof-copy-to-user.png -MANUALS = $(DOC)/$(DOC).html $(DOC)/$(DOC).pdf + figures/sysprof-copy-from-user.png figures/sysprof-copy-to-user.png \ + eclipse +MANUALS = $(DOC)/$(DOC).html $(DOC)/$(DOC).pdf $(DOC)/eclipse FIGURES = figures STYLESHEET = $(DOC)/*.css endif -- cgit v1.2.3-54-g00ecf