Kill @ symlink

[imp]

Summary

Replace the @ symlink in builds with ${SYSDIR} and conditionally set
${SYSDIR} in the one place where it seems to matter.

[brooks]

While it's not the described point of the diff, I noticed a missed opportunity to use ${SYSDIR} in sys/modules/svr4/Makefile in the .PATH definition.

[imp]

In D1100#2, @brooks wrote:

While it's not the described point of the diff, I noticed a missed opportunity to use ${SYSDIR} in sys/modules/svr4/Makefile in the .PATH definition.

Yes. That turns out to be a problem, not only there, but from the other places I did it. It isn't defined in the world / single module case, so make winds up not being able to find the header files, which is why I did the SYSDIR ?= bit where I did the substitution. Rather than propagate that widely, I thought I'd try to be minimal about it.

[imp]

Closed by commit rS274184 (authored by @imp).

head/sys/modules/linux/Makefile

 EXPORT_SYMS+=   linux_get_osrelease
 EXPORT_SYMS+=   linux_ifname
 EXPORT_SYMS+=   linux_ioctl_register_handler
 EXPORT_SYMS+=   linux_ioctl_unregister_handler
 
 CLEANFILES=        linux${SFX}_assym.h linux${SFX}_genassym.o
 
 linux${SFX}_assym.h: linux${SFX}_genassym.o
-.if exists(@)
-linux${SFX}_assym.h: @/kern/genassym.sh
-.endif
-        sh @/kern/genassym.sh linux${SFX}_genassym.o > ${.TARGET}
+        sh ${SYSDIR}/kern/genassym.sh linux${SFX}_genassym.o > ${.TARGET}
 
 linux${SFX}_locore.o: linux${SFX}_assym.h assym.s
         ${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
             ${.IMPSRC} -o ${.TARGET}
 
 linux${SFX}_support.o: linux${SFX}_assym.h assym.s
         ${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
             ${.IMPSRC} -o ${.TARGET}

head/sys/modules/svr4/Makefile

 # $FreeBSD$
 
 .PATH:        ${.CURDIR}/../../${MACHINE_CPUARCH}/svr4 ${.CURDIR}/../../compat/svr4
 KMOD=   svr4
 SRCS=   svr4_sysent.c svr4_sysvec.c opt_compat.h opt_svr4.h \
         vnode_if.h imgact_svr4.c svr4_signal.c svr4_fcntl.c \
         svr4_misc.c svr4_ioctl.c svr4_stat.c svr4_filio.c \
         svr4_termios.c svr4_stream.c svr4_socket.c svr4_sockio.c \
         svr4_machdep.c svr4_resource.c svr4_ipc.c
 OBJS=   svr4_locore.o 
 
 SRCS+=  opt_ktrace.h opt_sysvipc.h
 
 CLEANFILES=     svr4_assym.h svr4_genassym.o
 
 svr4_assym.h: svr4_genassym.o
-.if exists(@)
-svr4_assym.h: @/kern/genassym.sh
-.endif
-        sh @/kern/genassym.sh svr4_genassym.o > ${.TARGET}
+        sh ${SYSDIR}/kern/genassym.sh svr4_genassym.o > ${.TARGET}
 
 svr4_locore.o: svr4_locore.s svr4_assym.h
         ${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
                 ${.IMPSRC} -o ${.TARGET}
 
-svr4_genassym.o: svr4_genassym.c svr4.h @ machine
+svr4_genassym.o: svr4_genassym.c svr4.h
         ${CC} -c ${CFLAGS:N-fno-common} ${.IMPSRC}
 
 .if !defined(KERNBUILDDIR) && defined(DEBUG)
 opt_svr4.h:
         echo "#define DEBUG_SVR4 1" > ${.TARGET}
 .endif
 
 .include <bsd.kmod.mk>