d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make rescue use SRCTOP

Browse Source 
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)
This commit is contained in:
Warner Losh 2017-03-12 18:59:09 +00:00
parent 484482b8ad
commit 23583802cf
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rescue/librescue/Makefile
View File

@ -13,10 +13,10 @@ MK_SSP= no
# This library should never be installed, and isn't even linked # This library should never be installed, and isn't even linked
# with in the normal way. (See ../rescue/Makefile for details.) # with in the normal way. (See ../rescue/Makefile for details.)
.PATH: ${.CURDIR}/../../lib/libc/gen \ .PATH: ${SRCTOP}/lib/libc/gen \
${.CURDIR}/../../lib/libc/net \ ${SRCTOP}/lib/libc/net \
${.CURDIR}/../../lib/libc/stdlib \ ${SRCTOP}/lib/libc/stdlib \
${.CURDIR}/../../lib/libutil ${SRCTOP}/lib/libutil
LIB= rescue LIB= rescue
INTERNALLIB= # Don't install this library INTERNALLIB= # Don't install this library
@ -42,6 +42,6 @@ CFLAGS+= -DYP
.if ${MK_HESIOD} != "no" .if ${MK_HESIOD} != "no"
CFLAGS+= -DHESIOD CFLAGS+= -DHESIOD
.endif .endif
CFLAGS+= -I${.CURDIR}/../../lib/libc/include CFLAGS+= -I${SRCTOP}/lib/libc/include
.include <bsd.lib.mk> .include <bsd.lib.mk>

18
rescue/rescue/Makefile
View File

@ -160,16 +160,16 @@ CRUNCH_PROGS_sbin+= bsdlabel fdisk
CRUNCH_ALIAS_bsdlabel= disklabel CRUNCH_ALIAS_bsdlabel= disklabel
.endif .endif
CRUNCH_SRCDIR_atm= $(.CURDIR)/../../sbin/atm/atm CRUNCH_SRCDIR_atm= ${SRCTOP}/sbin/atm/atm
CRUNCH_SRCDIR_atmconfig= $(.CURDIR)/../../sbin/atm/atmconfig CRUNCH_SRCDIR_atmconfig= ${SRCTOP}/sbin/atm/atmconfig
CRUNCH_SRCDIR_fore_dnld= $(.CURDIR)/../../sbin/atm/fore_dnld CRUNCH_SRCDIR_fore_dnld= ${SRCTOP}/sbin/atm/fore_dnld
CRUNCH_SRCDIR_ilmid= $(.CURDIR)/../../sbin/atm/ilmid CRUNCH_SRCDIR_ilmid= ${SRCTOP}/sbin/atm/ilmid
CRUNCH_SRCDIR_rtquery= $(.CURDIR)/../../sbin/routed/rtquery CRUNCH_SRCDIR_rtquery= ${SRCTOP}/sbin/routed/rtquery
CRUNCH_SRCDIR_ipf= $(.CURDIR)/../../sbin/ipf/ipf CRUNCH_SRCDIR_ipf= ${SRCTOP}/sbin/ipf/ipf
.if ${MK_ZFS} != "no" .if ${MK_ZFS} != "no"
CRUNCH_SRCDIR_zfs= ${.CURDIR}/../../cddl/sbin/zfs CRUNCH_SRCDIR_zfs= ${SRCTOP}/cddl/sbin/zfs
CRUNCH_SRCDIR_zpool= ${.CURDIR}/../../cddl/sbin/zpool CRUNCH_SRCDIR_zpool= ${SRCTOP}/cddl/sbin/zpool
CRUNCH_SRCDIR_zdb= ${.CURDIR}/../../cddl/usr.sbin/zdb CRUNCH_SRCDIR_zdb= ${SRCTOP}/cddl/usr.sbin/zdb
.endif .endif
CRUNCH_ALIAS_reboot= fastboot halt fasthalt CRUNCH_ALIAS_reboot= fastboot halt fasthalt
CRUNCH_ALIAS_restore= rrestore CRUNCH_ALIAS_restore= rrestore