From 43e574558fdb9ace56faa388351137a59713fa0f Mon Sep 17 00:00:00 2001 From: Arun Thomas Date: Thu, 18 Aug 2011 18:06:24 +0200 Subject: [PATCH] tools/Makefile: tweak AVFS/APFS logic -Fixes GCC/clang build issue --- tools/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index a359ff748..e25970bf4 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -10,11 +10,11 @@ GEN_FILES= *.bak image kernel *.iso *.iso.gz cdfdimage rootimage src # Specify the programs that are part of the system image. .if ${BUILDAVFS} == "yes" -VFS= "../servers/avfs/vfs" -PFS= "../servers/apfs/pfs" +VFS= avfs +PFS= apfs .else -VFS= "../servers/vfs/vfs" -PFS= "../servers/pfs/pfs" +VFS= vfs +PFS= pfs .endif KERNEL= kernel PROGRAMS= \ @@ -22,13 +22,13 @@ PROGRAMS= \ ../servers/rs/rs \ ../servers/pm/pm \ ../servers/sched/sched \ - ${VFS} \ + ../servers/${VFS}/vfs \ ../drivers/memory/memory \ ../drivers/log/log \ ../drivers/tty/tty \ ../servers/mfs/mfs \ ../servers/vm/vm \ - ${PFS} \ + ../servers/${PFS}/pfs \ ../servers/init/init usage: -- 2.44.0