[src/trunk]: src/sbin If HOSTPROG is empty, do not pull in libutil, since we ...

[fvdl <fvdl%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b4939b16c082
branches:  trunk
changeset: 582272:b4939b16c082
user:      fvdl <fvdl%NetBSD.org@localhost>
date:      Thu Jun 23 00:54:47 2005 +0000

description:
If HOSTPROG is empty, do not pull in libutil, since we do not need it in that
case, and several host platforms do not have libutil. Fixes the build of
these programs as host tools on platforms without libutil.

diffstat:

 sbin/disklabel/Makefile |   6 ++++--
 sbin/fdisk/Makefile     |  11 ++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diffs (46 lines):

diff -r 9b726d4e0955 -r b4939b16c082 sbin/disklabel/Makefile
--- a/sbin/disklabel/Makefile   Thu Jun 23 00:53:16 2005 +0000
+++ b/sbin/disklabel/Makefile   Thu Jun 23 00:54:47 2005 +0000
@@ -1,11 +1,13 @@
-#      $NetBSD: Makefile,v 1.56 2005/06/17 21:20:18 dsl Exp $
+#      $NetBSD: Makefile,v 1.57 2005/06/23 00:54:47 fvdl Exp $
 #      @(#)Makefile    8.2 (Berkeley) 3/17/94
 
 PROG=  disklabel
 SRCS=  main.c dkcksum.c interact.c printlabel.c
 MAN=   disklabel.5 disklabel.8
+.if (${HOSTPROG:U} == "")
+DPADD+= ${LIBUTIL}
 LDADD+= -lutil
-DPADD+= ${LIBUTIL}
+.endif
 
 # these have additional requirements on the alignment of a partition
 .if (${MACHINE} == "sparc") || (${MACHINE} == "sparc64") \
diff -r 9b726d4e0955 -r b4939b16c082 sbin/fdisk/Makefile
--- a/sbin/fdisk/Makefile       Thu Jun 23 00:53:16 2005 +0000
+++ b/sbin/fdisk/Makefile       Thu Jun 23 00:54:47 2005 +0000
@@ -1,13 +1,7 @@
-#      $NetBSD: Makefile,v 1.33 2005/06/12 19:14:10 dyoung Exp $
-
-.if (${HOSTPROG:U} == "")
-SUBDIR=        mbr
-.endif
+#      $NetBSD: Makefile,v 1.34 2005/06/23 00:54:47 fvdl Exp $
 
 PROG=  fdisk 
 SRCS=  fdisk.c
-DPADD+=        ${LIBUTIL}
-LDADD+=        -lutil
 
 MAN=   fdisk.8
 
@@ -21,5 +15,8 @@
 
 .include <bsd.prog.mk>
 .if (${HOSTPROG:U} == "")
+SUBDIR=        mbr
+DPADD+=        ${LIBUTIL}
+LDADD+=        -lutil
 .include <bsd.subdir.mk>
 .endif