Date: Sun, 12 Mar 2017 18:59:10 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r315174 - in head/rescue: librescue rescue Message-ID: <201703121859.v2CIxA3R001875@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Sun Mar 12 18:59:09 2017 New Revision: 315174 URL: https://svnweb.freebsd.org/changeset/base/315174 Log: 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) Modified: head/rescue/librescue/Makefile head/rescue/rescue/Makefile Modified: head/rescue/librescue/Makefile ============================================================================== --- head/rescue/librescue/Makefile Sun Mar 12 18:59:05 2017 (r315173) +++ head/rescue/librescue/Makefile Sun Mar 12 18:59:09 2017 (r315174) @@ -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> Modified: head/rescue/rescue/Makefile ============================================================================== --- head/rescue/rescue/Makefile Sun Mar 12 18:59:05 2017 (r315173) +++ head/rescue/rescue/Makefile Sun Mar 12 18:59:09 2017 (r315174) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703121859.v2CIxA3R001875>