Combine {BSD,GNU}makefiles together, as GNU Make 4.0 supports != assignment

[gogost.git] / makedist.sh

diff --git a/makedist.sh b/makedist.sh
index 2fbbc3516ae579f23aeba22f71e858060a16058e..57a188a95ce934addeaf8771a47bfda2dcae126c 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -7,7 +7,7 @@ release=$1
 
 git clone . $tmp/gogost-$release
 cd $tmp/gogost-$release
-git checkout $release
+git checkout v$release
 
 mod_name=$(sed -n 's/^module //p' go.mod)
 crypto_mod_path=$(sed -n 's#^require \(golang.org/x/crypto\) \(.*\)$#\1@\2#p' go.mod)
@@ -22,7 +22,8 @@ mv \
     gost341264 \
     gost3413 \
     mgm \
-    internal gogost.go go.mod go.sum src/$mod_name
+    prfplus \
+    cmd internal gogost.go go.mod go.sum src/$mod_name
 
 mkdir -p src/golang.org/x/crypto
 ( cd $GOPATH/pkg/mod/$crypto_mod_path ; \
@@ -30,10 +31,10 @@ mkdir -p src/golang.org/x/crypto
     tar xfC - src/golang.org/x/crypto
 
 find . -name .git -type d | xargs rm -fr
-rm -f www* news.texi style.css makedist* TODO
+rm -f *.texi www.mk style.css makedist* TODO
 
-find . -type d -exec chmod 700 {} \;
-find . -type f -exec chmod 600 {} \;
+find . -type d -exec chmod 755 {} \;
+find . -type f -exec chmod 644 {} \;
 
 cd ..
 tar cvf gogost-"$release".tar --uid=0 --gid=0 --numeric-owner gogost-"$release"