make: Update to 4.3

1 files changed, 33 insertions, 10 deletions

diff --git a/pkg/make/gen.lua b/pkg/make/gen.lua
index 9806b57b..c7a6e785 100644
--- a/pkg/make/gen.lua
+++ b/pkg/make/gen.lua
@@ -1,21 +1,44 @@
 cflags{
 	'-D HAVE_CONFIG_H',
 	'-I $dir',
-	'-I $srcdir',
-	'-I $srcdir/glob',
+	'-I $srcdir/src',
+	'-I $srcdir/lib',
+	'-I $outdir',
 }
 
-lib('libglob.a', {'glob/glob.c', 'glob/fnmatch.c'})
+build('copy', '$outdir/fnmatch.h', '$srcdir/lib/fnmatch.in.h')
+build('copy', '$outdir/glob.h', '$srcdir/lib/glob.in.h')
+
+pkg.deps = {
+	'$outdir/fnmatch.h',
+	'$outdir/glob.h',
+}
+
+lib('libgnu.a', [[
+	lib/(
+		concat-filename.c exitfail.c findprog-in.c fnmatch.c
+		glob.c xalloc-die.c xconcat-filename.c
+	)
+]])
 
 exe('make', [[
-	ar.c arscan.c commands.c default.c dir.c expand.c file.c
-	function.c getopt.c getopt1.c guile.c implicit.c job.c load.c
-	loadapi.c main.c misc.c posixos.c output.c read.c remake.c
-	rule.c signame.c strcache.c variable.c version.c vpath.c
-	hash.c remote-stub.c
-	libglob.a
+	src/(
+		ar.c arscan.c commands.c
+		default.c dir.c expand.c
+		file.c function.c getopt.c
+		getopt1.c guile.c
+		hash.c implicit.c job.c
+		load.c loadapi.c main.c misc.c
+		output.c read.c remake.c
+		rule.c signame.c strcache.c
+		variable.c version.c vpath.c
+
+		posixos.c
+		remote-stub.c
+	)
+	libgnu.a
 ]])
 file('bin/make', '755', '$outdir/make')
 man{'make.1'}
 
-fetch 'git'
+fetch 'curl'