aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorlloyd <[email protected]>2015-01-10 04:56:13 +0000
committerlloyd <[email protected]>2015-01-10 04:56:13 +0000
commit1162f1bb72f463727743565ce788e3724d259517 (patch)
treecb7da810ede99335b809df537c71648b5e461499 /src
parent3f16815c9e6349c4a0eeb6a6ecfe004e5d31e287 (diff)
Move license text to a plain text file without ReST market
Diffstat (limited to 'src')
-rw-r--r--src/build-data/makefile/gmake.in6
-rwxr-xr-xsrc/scripts/install.py4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/build-data/makefile/gmake.in b/src/build-data/makefile/gmake.in
index 75ea3d508..f934dfca4 100644
--- a/src/build-data/makefile/gmake.in
+++ b/src/build-data/makefile/gmake.in
@@ -66,9 +66,9 @@ install: $(LIBRARIES) docs
website:
rm -rf $(WEBSITE_SRC_DIR) $(WEBSITE_DIR)
mkdir -p $(WEBSITE_SRC_DIR)
- cp -r %{doc_dir}/*.rst %{doc_dir}/relnotes %{doc_dir}/website/*.rst $(WEBSITE_SRC_DIR)
- sphinx-build -q -c $(SPHINX_CONFIG) -b html $(WEBSITE_SRC_DIR) $(WEBSITE_DIR)
- sphinx-build -q -c $(SPHINX_CONFIG) -b html %{doc_dir}/manual $(WEBSITE_DIR)/manual
+ cp -r %{doc_dir}/*.txt %{doc_dir}/*.rst %{doc_dir}/relnotes %{doc_dir}/website/*.rst $(WEBSITE_SRC_DIR)
+ sphinx-build -c $(SPHINX_CONFIG) -b html $(WEBSITE_SRC_DIR) $(WEBSITE_DIR)
+ sphinx-build -c $(SPHINX_CONFIG) -b html %{doc_dir}/manual $(WEBSITE_DIR)/manual
rm -rf $(WEBSITE_DIR)/.doctrees
rm -rf $(WEBSITE_DIR)/manual/.doctrees
rm -f $(WEBSITE_DIR)/.buildinfo
diff --git a/src/scripts/install.py b/src/scripts/install.py
index 70718bd22..8e19ed91c 100755
--- a/src/scripts/install.py
+++ b/src/scripts/install.py
@@ -198,8 +198,8 @@ def main(args = None):
shutil.rmtree(botan_doc_dir, True)
shutil.copytree(cfg['doc_output_dir'], botan_doc_dir)
- with open(os.path.join(botan_doc_dir, 'license.txt'), 'w+') as lic:
- lic.write(license_text('doc/license.rst'))
+ for f in [f for f in os.listdir(cfg['doc_dir']) if f.endswith('.txt')]:
+ shutil.copyfile(os.path.join(cfg['doc_dir'], f), os.path.join(botan_doc_dir, f))
with combine_relnotes.open_for_utf8(os.path.join(botan_doc_dir, 'news.txt'), 'w+') as news:
news.write(combine_relnotes.combine_relnotes('doc/relnotes', False))