From: Scott Rifenbark Date: Tue, 15 Mar 2016 18:31:37 +0000 (-0700) Subject: Makefile: Resolving a conflict X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=32629e01d674e1b221049e7c725b35ff5dab39c1;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git Makefile: Resolving a conflict (From yocto-docs rev: 221b8eeee23841395b6323da0893156346dead6f) Signed-off-by: Scott Rifenbark Signed-off-by: Richard Purdie --- diff --git a/documentation/Makefile b/documentation/Makefile index ab5b3cfa8a1..88966212deb 100644 --- a/documentation/Makefile +++ b/documentation/Makefile @@ -247,7 +247,8 @@ TARFILES = mega-manual.html mega-style.css figures/yocto-environment.png \ figures/simple-configuration.png figures/devtool-add-flow.png \ figures/devtool-modify-flow.png figures/devtool-upgrade-flow.png \ figures/compatible-layers.png figures/import-layer.png figures/new-project.png \ - figures/sdk-environment.png figures/sdk-installed-standard-sdk-directory.png + figures/sdk-environment.png figures/sdk-installed-standard-sdk-directory.png \ + figures/sdk-installed-extensible-sdk-directory.png endif MANUALS = $(DOC)/$(DOC).html @@ -290,6 +291,7 @@ XSLTOPTS = --xinclude ALLPREQ = html eclipse tarball TARFILES = sdk-manual.html sdk-style.css figures/sdk-title.png \ figures/sdk-environment.png figures/sdk-installed-standard-sdk-directory.png \ + figures/sdk-installed-extensible-sdk-directory.png \ eclipse MANUALS = $(DOC)/$(DOC).html $(DOC)/eclipse FIGURES = figures