Date: Mon, 19 May 2003 14:58:11 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 31483 for review Message-ID: <200305192158.h4JLwBjg037404@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=31483 Change 31483 by peter@peter_daintree on 2003/05/19 14:57:53 I dont know what the hell happened last time, but try and repair the damage. Affected files ... .. //depot/projects/hammer/sbin/bsdlabel/Makefile#7 integrate Differences ... ==== //depot/projects/hammer/sbin/bsdlabel/Makefile#7 (text+ko) ==== @@ -1,29 +1,29 @@ # @(#)Makefile 8.2 (Berkeley) 3/17/94 -# $FreeBSD: src/sbin/bsdlabel/Makefile,v 1.15 2003/05/05 21:28:08 phk Exp $ +# $FreeBSD: src/sbin/bsdlabel/Makefile,v 1.17 2003/05/17 19:06:45 ru Exp $ + +.PATH: ${.CURDIR}/../../sys/geom PROG= bsdlabel SRCS= bsdlabel.c geom_bsd_enc.c -#MAN+= bsdlabel.5 +#MAN= bsdlabel.5 MAN+= bsdlabel.8 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" LINKS= ${BINDIR}/bsdlabel ${BINDIR}/disklabel -MLINKS+= bsdlabel.8 disklabel.8 +MLINKS= bsdlabel.8 disklabel.8 .endif -DDADD= ${LIBGEOM} -LDADD= -lgeom -lbsdxml -lsbuf +DPADD= ${LIBGEOM} +LDADD= -lgeom .if ${MACHINE} == "pc98" -CFLAGS+= -DPC98 +CFLAGS+=-DPC98 .endif -.PATH: ${.CURDIR}/../../sys/geom - .include <bsd.prog.mk> -test: ${PROG} +test: ${PROG} sh ${.CURDIR}/runtest.sh -testx: ${PROG} +testx: ${PROG} sh -x ${.CURDIR}/runtest.sh
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305192158.h4JLwBjg037404>