aboutsummaryrefslogtreecommitdiffstats
path: root/rescue
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2017-03-12 18:59:09 +0000
committerWarner Losh <imp@FreeBSD.org>2017-03-12 18:59:09 +0000
commit23583802cf9a4384dbe37f60109da5bf344d7e7f (patch)
tree8f0c2e73dbbe4eff8b45cf7fcc4f47fdd3880d60 /rescue
parent484482b8ad59a8c68aaa1f0551a983c10b983a22 (diff)
downloadsrc-23583802cf9a4384dbe37f60109da5bf344d7e7f.tar.gz
src-23583802cf9a4384dbe37f60109da5bf344d7e7f.zip
Make rescue use SRCTOP
Transition to SRCTOP. Also, standardize of {} instead of () variable deliminators while I'm here. Differential Revision: https://reviews.freebsd.org/D9932 Sponsored by: Netflix Silence On: arch@ (twice)
Notes
Notes: svn path=/head/; revision=315174
Diffstat (limited to 'rescue')
-rw-r--r--rescue/librescue/Makefile10
-rw-r--r--rescue/rescue/Makefile18
2 files changed, 14 insertions, 14 deletions
diff --git a/rescue/librescue/Makefile b/rescue/librescue/Makefile
index 4ca6db923c88..e7147d8e67ce 100644
--- a/rescue/librescue/Makefile
+++ b/rescue/librescue/Makefile
@@ -13,10 +13,10 @@ MK_SSP= no
# This library should never be installed, and isn't even linked
# with in the normal way. (See ../rescue/Makefile for details.)
-.PATH: ${.CURDIR}/../../lib/libc/gen \
- ${.CURDIR}/../../lib/libc/net \
- ${.CURDIR}/../../lib/libc/stdlib \
- ${.CURDIR}/../../lib/libutil
+.PATH: ${SRCTOP}/lib/libc/gen \
+ ${SRCTOP}/lib/libc/net \
+ ${SRCTOP}/lib/libc/stdlib \
+ ${SRCTOP}/lib/libutil
LIB= rescue
INTERNALLIB= # Don't install this library
@@ -42,6 +42,6 @@ CFLAGS+= -DYP
.if ${MK_HESIOD} != "no"
CFLAGS+= -DHESIOD
.endif
-CFLAGS+= -I${.CURDIR}/../../lib/libc/include
+CFLAGS+= -I${SRCTOP}/lib/libc/include
.include <bsd.lib.mk>
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index 1c86c7841036..700f3520b4e7 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -160,16 +160,16 @@ CRUNCH_PROGS_sbin+= bsdlabel fdisk
CRUNCH_ALIAS_bsdlabel= disklabel
.endif
-CRUNCH_SRCDIR_atm= $(.CURDIR)/../../sbin/atm/atm
-CRUNCH_SRCDIR_atmconfig= $(.CURDIR)/../../sbin/atm/atmconfig
-CRUNCH_SRCDIR_fore_dnld= $(.CURDIR)/../../sbin/atm/fore_dnld
-CRUNCH_SRCDIR_ilmid= $(.CURDIR)/../../sbin/atm/ilmid
-CRUNCH_SRCDIR_rtquery= $(.CURDIR)/../../sbin/routed/rtquery
-CRUNCH_SRCDIR_ipf= $(.CURDIR)/../../sbin/ipf/ipf
+CRUNCH_SRCDIR_atm= ${SRCTOP}/sbin/atm/atm
+CRUNCH_SRCDIR_atmconfig= ${SRCTOP}/sbin/atm/atmconfig
+CRUNCH_SRCDIR_fore_dnld= ${SRCTOP}/sbin/atm/fore_dnld
+CRUNCH_SRCDIR_ilmid= ${SRCTOP}/sbin/atm/ilmid
+CRUNCH_SRCDIR_rtquery= ${SRCTOP}/sbin/routed/rtquery
+CRUNCH_SRCDIR_ipf= ${SRCTOP}/sbin/ipf/ipf
.if ${MK_ZFS} != "no"
-CRUNCH_SRCDIR_zfs= ${.CURDIR}/../../cddl/sbin/zfs
-CRUNCH_SRCDIR_zpool= ${.CURDIR}/../../cddl/sbin/zpool
-CRUNCH_SRCDIR_zdb= ${.CURDIR}/../../cddl/usr.sbin/zdb
+CRUNCH_SRCDIR_zfs= ${SRCTOP}/cddl/sbin/zfs
+CRUNCH_SRCDIR_zpool= ${SRCTOP}/cddl/sbin/zpool
+CRUNCH_SRCDIR_zdb= ${SRCTOP}/cddl/usr.sbin/zdb
.endif
CRUNCH_ALIAS_reboot= fastboot halt fasthalt
CRUNCH_ALIAS_restore= rrestore