Move license and news to top level directory

These files are important so make them easy to find for someone
unpacking the tarball for the first time.

6 files changed, 7 insertions, 6 deletions

diff --git a/configure.py b/configure.py
index 26589b281..bcbdcc669 100755
--- a/configure.py
+++ b/configure.py
@@ -1303,7 +1303,8 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo):
 
         'version_datestamp': build_config.version_datestamp,
 
-        'src_dir': build_config.src_dir,
+        'base_dir': options.base_dir,
+        'src_dir': options.src_dir,
         'doc_dir': build_config.doc_dir,
 
         'command_line': ' '.join(sys.argv),
@@ -1323,7 +1324,6 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo):
 
         'out_dir': options.with_build_dir or os.path.curdir,
         'build_dir': build_config.build_dir,
-        'src_dir': options.src_dir,
 
         'scripts_dir': os.path.join(build_config.src_dir, 'scripts'),
 
diff --git a/doc/contributing.rst b/doc/contributing.rst
index 64b609af5..979685112 100644
--- a/doc/contributing.rst
+++ b/doc/contributing.rst
@@ -64,7 +64,7 @@ year. Even if the years you are making the change are consecutive, avoid year
 ranges: specify each year separated by a comma.
 
 Also if you are a new contributor or making an addition in a new year, include
-an update to ``doc/license.txt`` in your PR.
+an update to ``license.txt`` in your PR.
 
 Style Conventions
 ========================================
diff --git a/doc/license.txt b/license.txt
index 88b16651c..88b16651c 100644
--- a/doc/license.txt
+++ b/license.txt
diff --git a/doc/news.rst b/news.rst
index f88b480d0..f88b480d0 100644
--- a/doc/news.rst
+++ b/news.rst
diff --git a/src/scripts/install.py b/src/scripts/install.py
index 799d8ea4e..0045be844 100755
--- a/src/scripts/install.py
+++ b/src/scripts/install.py
@@ -216,7 +216,8 @@ def main(args = None):
     for f in [f for f in os.listdir(cfg['doc_dir']) if f.endswith('.txt')]:
         copy_file(os.path.join(cfg['doc_dir'], f), os.path.join(target_doc_dir, f))
 
-    copy_file(os.path.join(cfg['doc_dir'], 'news.rst'), os.path.join(target_doc_dir, 'news.txt'))
+    copy_file(os.path.join(cfg['base_dir'], 'license.txt'), os.path.join(target_doc_dir, 'license.txt'))
+    copy_file(os.path.join(cfg['base_dir'], 'news.rst'), os.path.join(target_doc_dir, 'news.txt'))
 
     logging.info('Botan %s installation complete', cfg['version'])
 
diff --git a/src/scripts/website.sh b/src/scripts/website.sh
index 5b7e1c6cb..bb6e69df7 100755
--- a/src/scripts/website.sh
+++ b/src/scripts/website.sh
@@ -12,7 +12,7 @@ rm -rf $WEBSITE_SRC_DIR $WEBSITE_DIR
 mkdir -p $WEBSITE_SRC_DIR
 
 cp readme.rst $WEBSITE_SRC_DIR/index.rst
-cp -r doc/news.rst doc/security.rst $WEBSITE_SRC_DIR
+cp -r news.rst doc/security.rst $WEBSITE_SRC_DIR
 echo -e ".. toctree::\n\n   index\n   news\n   security\n" > $WEBSITE_SRC_DIR/contents.rst
 
 sphinx-build -t website -c "$SPHINX_CONFIG" -b "$SPHINX_BUILDER" $WEBSITE_SRC_DIR $WEBSITE_DIR
@@ -21,7 +21,7 @@ rm -rf $WEBSITE_DIR/.doctrees
 rm -f $WEBSITE_DIR/.buildinfo
 rm -rf $WEBSITE_DIR/manual/.doctrees
 rm -f $WEBSITE_DIR/manual/.buildinfo
-cp doc/license.txt doc/pgpkey.txt $WEBSITE_DIR
+cp license.txt doc/pgpkey.txt $WEBSITE_DIR
 
 doxygen build/botan.doxy
 mv build/docs/doxygen $WEBSITE_DIR/doxygen