Retire the '@' symlink. It isn't really needed and causes more

problems than it solves. SYSDIR is already defined almost always and
can be used instead. Working around the one case where it isn't is
much easier than working around the fact that @ may not exist in 18
other places.

Differential Revision: https://reviews.freebsd.org/D1100

4 files changed, 17 insertions, 39 deletions

diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index 0a617be..a671a33 100644
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -40,10 +40,7 @@ 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} \
diff --git a/sys/modules/sound/sound/Makefile b/sys/modules/sound/sound/Makefile
index 9650adf..ff9c48e 100644
--- a/sys/modules/sound/sound/Makefile
+++ b/sys/modules/sound/sound/Makefile
@@ -1,9 +1,11 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../dev/sound
-.PATH: ${.CURDIR}/../../../dev/sound/pcm
-.PATH: ${.CURDIR}/../../../dev/sound/midi
-.PATH: ${.CURDIR}/../../../dev/sound/isa
+SYSDIR?=${.CURDIR}/../../..
+
+.PATH: ${SYSDIR}/dev/sound
+.PATH: ${SYSDIR}/dev/sound/pcm
+.PATH: ${SYSDIR}/dev/sound/midi
+.PATH: ${SYSDIR}/dev/sound/isa
 
 KMOD=	sound
 SRCS=	device_if.h bus_if.h isa_if.h pci_if.h opt_isa.h
@@ -19,26 +21,14 @@ SRCS+=	ac97.c ac97_patch.c buffer.c channel.c clone.c dsp.c
 SRCS+=	mixer.c sndstat.c sound.c unit.c vchan.c
 SRCS+=	midi.c mpu401.c sequencer.c
 
-.if !exists(@)
-feeder_eq_gen.h:	@
-.else
-feeder_eq_gen.h:	@/tools/sound/feeder_eq_mkfilter.awk
-.endif
-	${AWK} -f @/tools/sound/feeder_eq_mkfilter.awk -- ${FEEDER_EQ_PRESETS} > ${.TARGET}
+feeder_eq_gen.h:	${SYSDIR}/tools/sound/feeder_eq_mkfilter.awk
+	${AWK} -f ${SYSDIR}/tools/sound/feeder_eq_mkfilter.awk -- ${FEEDER_EQ_PRESETS} > ${.TARGET}
 
-.if !exists(@)
-feeder_rate_gen.h:	@
-.else
-feeder_rate_gen.h:	@/tools/sound/feeder_rate_mkfilter.awk
-.endif
-	${AWK} -f @/tools/sound/feeder_rate_mkfilter.awk -- ${FEEDER_RATE_PRESETS} > ${.TARGET}
+feeder_rate_gen.h:	${SYSDIR}/tools/sound/feeder_rate_mkfilter.awk
+	${AWK} -f ${SYSDIR}/tools/sound/feeder_rate_mkfilter.awk -- ${FEEDER_RATE_PRESETS} > ${.TARGET}
 
-.if !exists(@)
-snd_fxdiv_gen.h:	@
-.else
-snd_fxdiv_gen.h:	@/tools/sound/snd_fxdiv_gen.awk
-.endif
-	${AWK} -f @/tools/sound/snd_fxdiv_gen.awk -- > ${.TARGET}
+snd_fxdiv_gen.h:	${SYSDIR}/tools/sound/snd_fxdiv_gen.awk
+	${AWK} -f ${SYSDIR}/tools/sound/snd_fxdiv_gen.awk -- > ${.TARGET}
 
 CLEANFILES+=	feeder_eq_gen.h feeder_rate_gen.h snd_fxdiv_gen.h
 
diff --git a/sys/modules/svr4/Makefile b/sys/modules/svr4/Makefile
index 9fc0901..85725a2 100644
--- a/sys/modules/svr4/Makefile
+++ b/sys/modules/svr4/Makefile
@@ -14,16 +14,13 @@ 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)
diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile
index 6aeaf80..330ea03 100644
--- a/sys/modules/vmm/Makefile
+++ b/sys/modules/vmm/Makefile
@@ -58,16 +58,10 @@ SRCS+=	vmcb.c		\
 CLEANFILES=	vmx_assym.h vmx_genassym.o svm_assym.h svm_genassym.o
 
 vmx_assym.h:    vmx_genassym.o
-.if exists(@)
-vmx_assym.h:    @/kern/genassym.sh
-.endif
-	sh @/kern/genassym.sh vmx_genassym.o > ${.TARGET}
+	sh ${SYSDIR}/kern/genassym.sh vmx_genassym.o > ${.TARGET}
 
 svm_assym.h:    svm_genassym.o
-.if exists(@)
-svm_assym.h:    @/kern/genassym.sh
-.endif
-	sh @/kern/genassym.sh svm_genassym.o > ${.TARGET}
+	sh ${SYSDIR}/kern/genassym.sh svm_genassym.o > ${.TARGET}
 
 vmx_support.o:
 	${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \