aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2021-10-31 17:46:35 +0100
committerDan Cross <crossd@gmail.com>2022-07-27 10:15:51 -0400
commit45124b23d284d1e205d830591007b7415440b70e (patch)
treed451b0f27a6d65fd95fefe2df87066d9afae4080
parentc53230037ac8ebed34ff8bf1af0a94aea0843c2e (diff)
upas: don't hardcode path for rc(1)
-rw-r--r--src/cmd/upas/nfs/imap.c3
-rw-r--r--src/cmd/upas/nfs/mkfile2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/cmd/upas/nfs/imap.c b/src/cmd/upas/nfs/imap.c
index 5249e2e7..fbd232fe 100644
--- a/src/cmd/upas/nfs/imap.c
+++ b/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]);
diff --git a/src/cmd/upas/nfs/mkfile b/src/cmd/upas/nfs/mkfile
index 7716ab58..a8f2d8e6 100644
--- a/src/cmd/upas/nfs/mkfile
+++ b/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