commit 45124b23d284d1e205d830591007b7415440b70e
from: Sören Tempel <soeren+git@soeren-tempel.net>
via: Dan Cross <crossd@gmail.com>
date: Wed Jul 27 14:15:51 2022 UTC

upas: don't hardcode path for rc(1)

commit - c53230037ac8ebed34ff8bf1af0a94aea0843c2e
commit + 45124b23d284d1e205d830591007b7415440b70e
blob - 5249e2e788518c1594bffd0c31bd42f0209bb3c0
blob + fbd232fef9b5ba636de87bff69c715a9b60065ff
--- src/cmd/upas/nfs/imap.c
+++ src/cmd/upas/nfs/imap.c
@@ -825,7 +825,8 @@ imapdial(char *server, int mode)
 		fd[0] = dup(p[0], -1);
 		fd[1] = dup(p[0], -1);
 		fd[2] = dup(2, -1);
-		if(threadspawnl(fd, "/usr/local/plan9/bin/rc", "rc", "-c", server, nil) < 0){
+		/* could do better - use get9root for rc(1) path */
+		if(threadspawnl(fd, PLAN9_TARGET "/bin/rc", "rc", "-c", server, nil) < 0){
 			close(p[0]);
 			close(p[1]);
 			close(fd[0]);
blob - 7716ab58d486244d6ed1245209f08ae87f7fc3b6
blob + a8f2d8e64b397ee17303a700e3a50f9c4d1abe3d
--- src/cmd/upas/nfs/mkfile
+++ src/cmd/upas/nfs/mkfile
@@ -16,3 +16,5 @@ HFILES=a.h box.h imap.h sx.h
 
 <$PLAN9/src/mkone
 
+imap.$O: imap.c
+	$CC $CFLAGS -DPLAN9_TARGET=\"$PLAN9_TARGET\" imap.c