summaryrefslogtreecommitdiffstats
path: root/documentation/Makefile
diff options
context:
space:
mode:
authorScott Rifenbark <srifenbark@gmail.com>2016-03-15 11:31:37 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-23 21:56:07 +0000
commit32629e01d674e1b221049e7c725b35ff5dab39c1 (patch)
treedb80ac623dc3d8d5f79d2711630b5540fa1d614d /documentation/Makefile
parentaf40e9a315e84840f8743a18003df17fe9d57f51 (diff)
downloadopenembedded-core-contrib-32629e01d674e1b221049e7c725b35ff5dab39c1.tar.gz
openembedded-core-contrib-32629e01d674e1b221049e7c725b35ff5dab39c1.tar.bz2
openembedded-core-contrib-32629e01d674e1b221049e7c725b35ff5dab39c1.zip
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>
Diffstat (limited to 'documentation/Makefile')
-rw-r--r--documentation/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/documentation/Makefile b/documentation/Makefile
index ab5b3cfa8a..88966212de 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