Module Name: src
Committed By: agc
Date: Thu Mar 28 05:31:22 UTC 2013
Modified Files:
src/rescue [agc-symver]: Makefile list.pdisk
Log Message:
Pull up fixes from HEAD after pdisk move to external
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.27.18.1 src/rescue/Makefile
cvs rdiff -u -r1.1 -r1.1.68.1 src/rescue/list.pdisk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/rescue/Makefile
diff -u src/rescue/Makefile:1.27 src/rescue/Makefile:1.27.18.1
--- src/rescue/Makefile:1.27 Wed Mar 10 23:13:10 2010
+++ src/rescue/Makefile Thu Mar 28 05:31:22 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2010/03/10 23:13:10 abs Exp $
+# $NetBSD: Makefile,v 1.27.18.1 2013/03/28 05:31:22 agc Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -19,13 +19,20 @@ LISTS= ${.CURDIR}/list
TARGETDIR= ${DESTDIR}/rescue
PARSELISTENV+= TARGETDIR=${TARGETDIR:Q}
-.for f in ldconfig pdisk
+.for f in ldconfig
PROG_${f}!= cd ${NETBSDSRCDIR}/sbin/${f} && ${MAKE} -V PROG
.if (${PROG_${f}} != "")
LISTS+= ${.CURDIR}/list.${f}
.endif
.endfor
+.for f in pdisk
+PROG_${f}!= cd ${NETBSDSRCDIR}/external/bsd/${f}/bin && ${MAKE} -V PROG
+.if (${PROG_${f}} != "")
+LISTS+= ${.CURDIR}/list.${f}
+.endif
+.endfor
+
.if ${USE_INET6} != "no"
LISTS+= ${.CURDIR}/list.inet6
.endif
Index: src/rescue/list.pdisk
diff -u src/rescue/list.pdisk:1.1 src/rescue/list.pdisk:1.1.68.1
--- src/rescue/list.pdisk:1.1 Thu Aug 22 01:23:47 2002
+++ src/rescue/list.pdisk Thu Mar 28 05:31:22 2013
@@ -1,3 +1,4 @@
-# $NetBSD: list.pdisk,v 1.1 2002/08/22 01:23:47 lukem Exp $
+# $NetBSD: list.pdisk,v 1.1.68.1 2013/03/28 05:31:22 agc Exp $
PROG pdisk
+SPECIAL pdisk srcdir external/bsd/pdisk/bin
