makefilegnurl-7.67.0

2 files changed, 8 insertions, 7 deletions

diff --git a/aux-gnurl/makefile b/aux-gnurl/makefile
index ea0908b85..3ec12595c 100644
--- a/aux-gnurl/makefile
+++ b/aux-gnurl/makefile
@@ -19,12 +19,12 @@ lint:
 .PHONY: release
 release:
 	(cd .. ; sh ./buildconf)
-	(cd .. ; CC="ccache cc" sh ./configure-gnurl)
-	(cd .. ; gmake)
-	(cd .. ; gmake -C tests test)
+	(cd .. ; sh ./configure-gnurl)
+	(cd .. ; make)
+	(cd .. ; make -C tests test)
 #	(cd .. ; gmake distcheck)
-	(cd .. ; gmake clean ; cd aux-gnurl ; git restore Makefile)
-	(cd .. ; MAKE="gmake" ./maketgz 7.67.0)
+	(cd .. ; make clean ; cd aux-gnurl ; git restore makefile)
+	(cd .. ; MAKE="make" ./maketgz 7.67.0)
 
 .PHONE: clean
 clean:
diff --git a/maketgz b/maketgz
index b6086949f..ed749d8af 100755
--- a/maketgz
+++ b/maketgz
@@ -123,7 +123,6 @@ findprog() {
 # Enforce a rerun of configure (updates the VERSION)
 
 echo "Re-running config.status"
-# CC=clang ./config.status --recheck --disable-ftp --disable-file --disable-ldap --disable-rtsp --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher --without-ssl --disable-libpsl --without-libpsl --without-librtmp --disable-ntlm-wb >/dev/null
 ./config.status --recheck > /dev/null
 
 # automake is needed to run to make a non-GNU Makefile.in if Makefile.am has been modified.
@@ -153,7 +152,9 @@ tarball="gnurl-$version.tar"
 tardir="gnurl-$version"
 # TODO: Here's something we need to fix for nbsd make to work.
 # MAKE=gmake is required.
-gmake -sj1 dist VERSION=$version
+# gmake -sj1 dist VERSION=$version
+# make -sj1 dist VERSION=$version
+make dist VERSION=$version
 
 # Now make an Z archive from the tar.gz original