Makefile: Resolving a conflict

(From yocto-docs rev: 221b8eeee23841395b6323da0893156346dead6f)

Signed-off-by: Scott Rifenbark <srifenbark@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/documentation/Makefile b/documentation/Makefile
index ab5b3cfa8a10adc5452ab6e8d384b19cc08db4f0..88966212debcff0576981b04e2f1ff37ba45504a 100644 (file)
--- 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