From owner-svn-src-all@freebsd.org Sun Mar 12 18:59:11 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5E1B0D08B99; Sun, 12 Mar 2017 18:59:11 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 13FA711D4; Sun, 12 Mar 2017 18:59:11 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2CIxAvt001877; Sun, 12 Mar 2017 18:59:10 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2CIxA3R001875; Sun, 12 Mar 2017 18:59:10 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201703121859.v2CIxA3R001875@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sun, 12 Mar 2017 18:59:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r315174 - in head/rescue: librescue rescue X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Mar 2017 18:59:11 -0000 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 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