maketgz: make it work for nowgnurl-7.63.0

1 files changed, 18 insertions, 15 deletions

diff --git a/maketgz b/maketgz
index e70358c52..7eb595988 100755
--- a/maketgz
+++ b/maketgz
@@ -148,38 +148,39 @@ touch src/tool_hugehelp.c
 
 # Update the IDE files
 echo "make vc-ide"
-make -s vc-ide
+# make -s vc-ide
 
 echo "produce CHANGES"
 git log --pretty=fuller --no-color --date=short --decorate=full -1000 | ./scripts/log2changes.pl > CHANGES.dist
 
 # Guix, revert shebang-patches in ltmain.sh
 
-echo "revert shebang patches in ltmain.sh"
-sed -i 's|/gnu/store/[a-z0-9]\{32\}-bash-minimal-4.4.12||' ltmain.sh
+# echo "revert shebang patches in ltmain.sh"
+# sed -i 's|/gnu/store/[a-z0-9]\{32\}-bash-minimal-4.4.12||' ltmain.sh
 
 # Now run make dist to generate a tar.gz archive
 
 echo "make dist"
 targz="gnurl-$version.tar.gz"
 tarball="gnurl-$version.tar"
-tarx="gnurl-$version"
-# TODO: Here's something we need to fix for nbsd make to work:
+tardir="gnurl-$version"
+# TODO: Here's something we need to fix for nbsd make to work.
+# MAKE=gmake is required.
 gmake -sj dist VERSION=$version
 
 # Now make an Z archive from the tar.gz original
 
-compress="gnurl-$version.tar.Z"
+compressfile="gnurl-$version.tar.Z"
 tempdir=".builddir"
 
 makeZ() {
     rm -rf $tempdir
     mkdir $tempdir
     cd $tempdir
-    tar -xf ../$targz
-    tar -cvf $tarball $tarx
-    compress -c $tarball > $compress
-    mv $compress ../
+    pax -rz < ../$targz
+    pax -wvf $tarball $tardir
+    compress -vc $tarball > $compressfile
+    mv $compressfile ../
     cd ..
     rm -rf $tempdir
 }
@@ -210,13 +211,15 @@ makepax(){
 	rm -rf $tempdir
 	mkdir $tempdir
 	cd $tempdir
-	pax -wvf $paxfile $(find .)
-	compress -c $paxfile > $paxz
+        pax -rz < ../$targz
+	pax -wvf $paxfile $tardir
+	compress -cv $paxfile > $paxz
 	mv $paxz ../
+        cd ..
 	rm -rf $tempdir
 }
 
-echo "Generating $compress"
+echo "Generating $compressfile"
 makeZ
 
 printf "%s" "Generating $paxz"
@@ -225,7 +228,7 @@ makepax
 echo "------------------"
 echo "maketgz report:"
 echo ""
-ls -l $targz $compress $paxz
+ls -l $targz $compressfile $paxz
 
 echo "Run this:"
-echo "gpg2 -b -a $targz && gpg2 -b -a $compress && gpg2 -b -a $paxz"
+echo "gpg2 -b -a $targz && gpg2 -b -a $compressfile && gpg2 -b -a $paxz"