From owner-svn-src-all@FreeBSD.ORG Sat Feb 12 06:22:23 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5F5A6106564A; Sat, 12 Feb 2011 06:22:23 +0000 (UTC) (envelope-from nyan@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4D1908FC17; Sat, 12 Feb 2011 06:22:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1C6MNtU087402; Sat, 12 Feb 2011 06:22:23 GMT (envelope-from nyan@svn.freebsd.org) Received: (from nyan@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1C6MNIx087400; Sat, 12 Feb 2011 06:22:23 GMT (envelope-from nyan@svn.freebsd.org) Message-Id: <201102120622.p1C6MNIx087400@svn.freebsd.org> From: Takahashi Yoshihiro Date: Sat, 12 Feb 2011 06:22:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218595 - head/sys/boot/pc98/pc98boot X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Sat, 12 Feb 2011 06:22:23 -0000 Author: nyan Date: Sat Feb 12 06:22:23 2011 New Revision: 218595 URL: http://svn.freebsd.org/changeset/base/218595 Log: Fix build. Modified: head/sys/boot/pc98/pc98boot/Makefile Modified: head/sys/boot/pc98/pc98boot/Makefile ============================================================================== --- head/sys/boot/pc98/pc98boot/Makefile Sat Feb 12 02:41:33 2011 (r218594) +++ head/sys/boot/pc98/pc98boot/Makefile Sat Feb 12 06:22:23 2011 (r218595) @@ -1,14 +1,22 @@ # $FreeBSD$ FILES= ${BOOT} -SRCS= ${BOOT0} ${BOOT05} CLEANFILES= ${BOOT} ${BOOT}.part BOOT= pc98boot + +.if exists(${.OBJDIR}/../boot0) +BOOT0= ${.OBJDIR}/../boot0/boot0 +.else BOOT0= ${.CURDIR}/../boot0/boot0 +.endif +.if exists(${.OBJDIR}/../boot0.5) +BOOT05= ${.OBJDIR}/../boot0.5/boot0.5 +.else BOOT05= ${.CURDIR}/../boot0.5/boot0.5 +.endif -${BOOT}: ${SRCS} ${BOOT}.part +${BOOT}: ${BOOT0} ${BOOT05} ${BOOT}.part cat ${BOOT0} ${BOOT}.part ${BOOT05} > ${.TARGET} ${BOOT}.part: