From 13beb6c9f92c0b3d56fc9aa06eb2259fb8390949 Mon Sep 17 00:00:00 2001 From: Andreas Bofjall Date: Wed, 7 May 2014 06:29:24 +0200 Subject: setup.py: fix documentation build setup.py currently aborts when building the documentation: > ./setup.py build [..] error: [Errno 2] No such file or directory: '/home/jab/src/x/bitbake/doc/manual' because the doc/manual directory has been renamed to doc/bitbake-user-manual since commit 452a62a ("doc: Rename user-manual -> bitbake-user-manual") and its Makefile has been removed as of commit d419907 ("user-manual: Import YP Docs templates for usermanual improvements"). Update setup.py to reflect the new name and usage. Signed-off-by: Andreas Bofjall Signed-off-by: Richard Purdie --- setup.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 8c26a9b8d..02de77bd6 100755 --- a/setup.py +++ b/setup.py @@ -33,17 +33,17 @@ class Clean(clean): def run(self): clean.run(self) origpath = os.path.abspath(os.curdir) - os.chdir(os.path.join(origpath, 'doc', 'manual')) + os.chdir(os.path.join(origpath, 'doc')) make = os.environ.get('MAKE') or 'make' - os.system('%s clean-%s' % (make, doctype)) + os.system('%s clean-%s DOC=bitbake-user-manual' % (make, doctype)) class Build(build): def run(self): build.run(self) origpath = os.path.abspath(os.curdir) - os.chdir(os.path.join(origpath, 'doc', 'manual')) + os.chdir(os.path.join(origpath, 'doc')) make = os.environ.get('MAKE') or 'make' - ret = os.system('%s %s' % (make, doctype)) + ret = os.system('%s %s DOC=bitbake-user-manual' % (make, doctype)) if ret != 0: print("ERROR: Unable to generate html documentation.") sys.exit(ret) @@ -58,7 +58,7 @@ setup(name='bitbake', py_modules = ["codegen"], scripts = ["bin/bitbake", "bin/bitbake-layers", "bin/bitbake-diffsigs", "bin/bitbake-prserv", "bin/bitbake-selftest", "bin/image-writer"], data_files = [("share/bitbake", glob("conf/*") + glob("classes/*")), - ("share/doc/bitbake-%s/manual" % __version__, glob("doc/manual/html/*"))], + ("share/doc/bitbake-%s/bitbake-user-manual" % __version__, glob("doc/bitbake-user-manual/html/*"))], cmdclass = { "build": Build, "clean": Clean, -- cgit 1.2.3-korg