From 9b073f312453481bbf5840f8b2d9a3a2723076d8 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@sudo.ws>
Date: Wed, 21 Feb 2024 13:01:14 -0700
Subject: [PATCH] Using $< in a non-suffix rule context is a GNU make
 extension.

---
 lib/util/Makefile.in | 8 ++++----
 scripts/mkdep.pl     | 8 +++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/util/Makefile.in b/lib/util/Makefile.in
index 9a095ac2d..ea4a06531 100644
--- a/lib/util/Makefile.in
+++ b/lib/util/Makefile.in
@@ -273,16 +273,16 @@ $(srcdir)/sys_signame.h: $(srcdir)/siglist.in
 	fi
 
 sys_siglist.i: $(srcdir)/sys_siglist.h
-	$(CPP) $(CPPFLAGS) $< > $@
+	$(CPP) $(CPPFLAGS) $(srcdir)/sys_siglist.h > $@
 
 sys_signame.i: $(srcdir)/sys_signame.h
-	$(CPP) $(CPPFLAGS) $< > $@
+	$(CPP) $(CPPFLAGS) $(srcdir)/sys_signame.h > $@
 
 mksiglist.h: sys_siglist.i
-	$(SED) -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' < $< > mksiglist.h
+	$(SED) -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' < sys_siglist.i > mksiglist.h
 
 mksigname.h: sys_signame.i
-	$(SED) -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' < $< > mksigname.h
+	$(SED) -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' < sys_signame.i > mksigname.h
 
 closefrom_test: $(CLOSEFROM_TEST_OBJS) libsudo_util.la
 	$(LIBTOOL) $(LTFLAGS) --mode=link $(CC) -o $@ $(CLOSEFROM_TEST_OBJS) libsudo_util.la $(ASAN_LDFLAGS) $(PIE_LDFLAGS) $(HARDENING_LDFLAGS) $(TEST_LDFLAGS) $(TEST_LIBS)
diff --git a/scripts/mkdep.pl b/scripts/mkdep.pl
index ebd98606d..c25161857 100755
--- a/scripts/mkdep.pl
+++ b/scripts/mkdep.pl
@@ -156,7 +156,7 @@ sub mkdep {
     #$dir_vars{'top_builddir'} = '.';
     $dir_vars{'incdir'} = 'include';
 
-    # Find implicit rules for generated .o and .lo files
+    # Find implicit rules for generated .i, .lo, .o and .plog files
     %implicit = ();
     while ($makefile =~ /^\.[ci]\.(l?o|i|plog):\s*\n\t+(.*)$/mg) {
 	$implicit{$1} = $2;
@@ -214,7 +214,6 @@ sub mkdep {
 
 	    # PVS Studio files (.i and .plog) but only do them once.
 	    if ($ext ne "o" || !exists($objs{"$base.lo"})) {
-		$imp = $implicit{"i"};
 		if (exists $implicit{"i"} && exists $implicit{"plog"}) {
 		    if ($src =~ /\.pb-c.c$/) {
 			# Do not check protobuf-c generated files
@@ -223,6 +222,7 @@ sub mkdep {
 			$new_makefile .= "\ttouch \$@\n";
 		    } else {
 			$imp = $implicit{"i"};
+			$imp =~ s/\$</$src/g;
 			$deps =~ s/\.l?o/.i/;
 			$new_makefile .= $deps;
 			$new_makefile .= "\t$imp\n";
@@ -231,7 +231,9 @@ sub mkdep {
 			$imp =~ s/ifile=\$<; *//;
 			$imp =~ s/\$\$\{ifile\%i\}c/$src/;
 			$obj =~ /(.*)\.[a-z]+$/;
-			$new_makefile .= "${1}.plog: ${1}.i\n";
+			my $base = $1;
+			$imp =~ s/\$</${base}.i/g;
+			$new_makefile .= "${base}.plog: ${base}.i\n";
 			$new_makefile .= "\t$imp\n";
 		    }
 		}