From 0a6b393e204d437763a443d3de5e146d3b5c6ea7 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 19 Feb 2020 13:49:52 +0300 Subject: Fix copyright notice extraction for building and documentation generating --- bpkg/buildfile | 6 +++--- doc/cli.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bpkg/buildfile b/bpkg/buildfile index 91cf6e7..a3ecd89 100644 --- a/bpkg/buildfile +++ b/bpkg/buildfile @@ -86,9 +86,9 @@ obj{utility}: cxx.poptions += -DBPKG_EXE_SUFFIX='"'$bin.exe.suffix'"' # Pass the copyright notice extracted from the LICENSE file. # -copyright = $process.run_regex( \ - cat $src_root/LICENSE, \ - 'Copyright \(c\) (.+) \(see the AUTHORS file\)\.', \ +copyright = $process.run_regex( \ + cat $src_root/LICENSE, \ + 'Copyright \(c\) (.+) \(see the AUTHORS and LEGAL files\)\.', \ '\1') obj{bpkg}: cxx.poptions += -DBPKG_COPYRIGHT=\"$copyright\" diff --git a/doc/cli.sh b/doc/cli.sh index 967c27f..c418158 100755 --- a/doc/cli.sh +++ b/doc/cli.sh @@ -9,7 +9,7 @@ function info () { echo "$*" 1>&2; } function error () { info "$*"; exit 1; } date="$(date +"%B %Y")" -copyright="$(sed -n -re 's%^Copyright \(c\) (.+) \(see the AUTHORS file\)\.$%\1%p' ../LICENSE)" +copyright="$(sed -n -re 's%^Copyright \(c\) (.+) \(see the AUTHORS and LEGAL files\)\.$%\1%p' ../LICENSE)" while [ $# -gt 0 ]; do case $1 in -- cgit v1.1