Merge branch 'master' of https://github.com/mattock/easy-rsa into mattock-master

Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
This commit is contained in:
Eric F Crist 2017-09-12 08:16:26 -05:00
commit 64241d0467

View File

@ -69,7 +69,7 @@ stage_unix() {
mkdir -p "$DIST_ROOT/unix/$PV"
# Copy files into $PV, starting with easyrsa3 as the initial root dir
src_files="easyrsa3/ Licensing/ COPYING.md ChangeLog README.quickstart.md"
src_files="easyrsa3/ Licensing/ COPYING.md ChangeLog README.md README.quickstart.md"
for f in $src_files
do
cp -a "$SRC_ROOT/$f" "$DIST_ROOT/unix/$PV" || die "failed to copy $f"
@ -94,9 +94,12 @@ stage_win() {
python -m markdown "$f" > "$DIST_ROOT/windows/$PV/doc/$fname.html"
done
python -m markdown "$SRC_ROOT/README.quickstart.md" > "$DIST_ROOT/windows/$PV/README.quickstart.html"
for f in "README" "README.quickstart" "COPYING"
do
python -m markdown $SRC_ROOT/$f.md > $DIST_ROOT/windows/$PV/$f.html
done
# Copy files into $PV, starting with easyrsa3 as the initial root dir
src_files="easyrsa3/ COPYING.md ChangeLog"
src_files="easyrsa3/ ChangeLog COPYING.md "
for f in $src_files
do
cp -a "$SRC_ROOT/$f" "$DIST_ROOT/windows/$PV" || die "failed to copy $f"