diskdev_cmds: Fix BINDIRs

diff --git a/diskdev_cmds/dev_mkdb.tproj/Makefile b/diskdev_cmds/dev_mkdb.tproj/Makefile
index 2871183ebddbabefb7cba6cbefcc2bf3254d6624..141726fb40031d6d01c796abee17c23b9c3e6890 100644 (file)
--- a/diskdev_cmds/dev_mkdb.tproj/Makefile
+++ b/diskdev_cmds/dev_mkdb.tproj/Makefile
@@ -1,4 +1,6 @@
 PROG=  dev_mkdb
 MAN=   dev_mkdb.8
 
+BINDIR=/usr/sbin
+
 .include <bsd.prog.mk>

diff --git a/diskdev_cmds/edquota.tproj/Makefile b/diskdev_cmds/edquota.tproj/Makefile
index c45697ff2ffa9362fd1fb4fc6f57d618d1cce3a4..5d063c13ee24e7a7728f5bbab17b9971dfa9b7eb 100644 (file)
--- a/diskdev_cmds/edquota.tproj/Makefile
+++ b/diskdev_cmds/edquota.tproj/Makefile
@@ -1,4 +1,6 @@
 PROG=  edquota
 MAN=   edquota.8
 
+BINDIR=/usr/sbin
+
 .include <bsd.prog.mk>

diff --git a/diskdev_cmds/fdisk.tproj/Makefile b/diskdev_cmds/fdisk.tproj/Makefile
index c4b5f7970f3a51465bdf5b48f7866ebfae8c7907..a6238926b1ae648b549f418e4a59e163fc0d102a 100644 (file)
--- a/diskdev_cmds/fdisk.tproj/Makefile
+++ b/diskdev_cmds/fdisk.tproj/Makefile
@@ -11,4 +11,6 @@ SRCS= auto.c \
        part.c \
        user.c
 
+BINDIR=/usr/sbin
+
 .include <bsd.prog.mk>

diff --git a/diskdev_cmds/fsck.tproj/Makefile b/diskdev_cmds/fsck.tproj/Makefile
index 8ac15dea5a87efe9434a44e9270d65e970dc4b15..445c335bcbbefeeb276357f7c39471ab63debe12 100644 (file)
--- a/diskdev_cmds/fsck.tproj/Makefile
+++ b/diskdev_cmds/fsck.tproj/Makefile
@@ -3,4 +3,6 @@ MAN=    fsck.8
 
 CFLAGS+=-DTARGET_OS_SIMULATOR -DTARGET_OS_IPHONE=0
 
+BINDIR=/sbin
+
 .include <bsd.prog.mk>

diff --git a/diskdev_cmds/fuser.tproj/Makefile b/diskdev_cmds/fuser.tproj/Makefile
index a7ea1b618b531d4c7e67e4a621469f4a43344e49..19b1df9e1c0731b7c1bb11075292f8f4bc297035 100644 (file)
--- a/diskdev_cmds/fuser.tproj/Makefile
+++ b/diskdev_cmds/fuser.tproj/Makefile
@@ -1,3 +1,5 @@
 SCRIPTS=       fuser.pl
 
+BINDIR=/usr/bin
+
 .include <bsd.prog.mk>

diff --git a/diskdev_cmds/mount.tproj/Makefile b/diskdev_cmds/mount.tproj/Makefile
index cc671bf3edd27177ca7c7235642a85e714bc834f..172c51d38e43b503142a65c723dcf4c0728bd1dd 100644 (file)
--- a/diskdev_cmds/mount.tproj/Makefile
+++ b/diskdev_cmds/mount.tproj/Makefile
@@ -1,3 +1,5 @@
 MAN=   fstab.5
 
+BINDIR=/sbin
+
 .include <bsd.prog.mk>

diff --git a/diskdev_cmds/mount_devfs.tproj/Makefile b/diskdev_cmds/mount_devfs.tproj/Makefile
index d1d34aa995c35404b78ced66679a5785fee26cee..3f4c03cd444751d0edc701f30dced7f8a3379848 100644 (file)
--- a/diskdev_cmds/mount_devfs.tproj/Makefile
+++ b/diskdev_cmds/mount_devfs.tproj/Makefile
@@ -3,4 +3,6 @@ MAN=
 
 LDADD=-lutil
 
+BINDIR=/sbin
+
 .include <bsd.prog.mk>

diff --git a/diskdev_cmds/mount_fdesc.tproj/Makefile b/diskdev_cmds/mount_fdesc.tproj/Makefile
index ac719993c9db2f45914306233e120f34449169ee..7ed96713c478e6f580b883829db82813ac5febf3 100644 (file)
--- a/diskdev_cmds/mount_fdesc.tproj/Makefile
+++ b/diskdev_cmds/mount_fdesc.tproj/Makefile
@@ -3,4 +3,6 @@ MAN=    mount_fdesc.8
 
 LDADD=-lutil
 
+BINDIR=/sbin
+
 .include <bsd.prog.mk>

diff --git a/diskdev_cmds/quota.tproj/Makefile b/diskdev_cmds/quota.tproj/Makefile
index 6cf0042a776648538d3ca21f14b58c19c33d329f..ba137fe283046fa35cc2e5c62136ed6935a361e5 100644 (file)
--- a/diskdev_cmds/quota.tproj/Makefile
+++ b/diskdev_cmds/quota.tproj/Makefile
@@ -1,4 +1,6 @@
 PROG=  quota
 MAN=   quota.1
 
+BINDIR=/usr/bin
+
 .include <bsd.prog.mk>

diff --git a/diskdev_cmds/quotacheck.tproj/Makefile b/diskdev_cmds/quotacheck.tproj/Makefile
index cc09b67dcacc956ce49be759d08ff711d219e7a9..b90f20e9efc6b5a656f18cd9f2a65da210cfb1ec 100644 (file)
--- a/diskdev_cmds/quotacheck.tproj/Makefile
+++ b/diskdev_cmds/quotacheck.tproj/Makefile
@@ -1,9 +1,9 @@
 PROG=  quotacheck
 MAN=   quotacheck.8
-SRCS=  quotacheck.c \
-       hfs_quotacheck.c \
-       preen.c
+SRCS=  quotacheck.c hfs_quotacheck.c preen.c
 
 .PATH: ${.CURDIR}/../disklib
 
+BINDIR=/usr/sbin
+
 .include <bsd.prog.mk>

diff --git a/diskdev_cmds/quotaon.tproj/Makefile b/diskdev_cmds/quotaon.tproj/Makefile
index 7ab7ff7ff8be2bab2cce7199a3d57e79d79a87f3..8cda80c22e7dddf278c13385d571f497c99c616e 100644 (file)
--- a/diskdev_cmds/quotaon.tproj/Makefile
+++ b/diskdev_cmds/quotaon.tproj/Makefile
@@ -1,4 +1,8 @@
 PROG=  quotaon
+LINKS= ${BINDIR}/quotaon ${BINDIR}/quotaoff
 MAN=   quotaon.8
+MLINKS=        quotaon.8 quotaoff.8
+
+BINDIR=/usr/sbin
 
 .include <bsd.prog.mk>

diff --git a/diskdev_cmds/repquota.tproj/Makefile b/diskdev_cmds/repquota.tproj/Makefile
index f86e6f8848bac6d2d87fd6f00ff3254b6b491750..0cc629ba37ce665773b21e9100c5a38c53db16b1 100644 (file)
--- a/diskdev_cmds/repquota.tproj/Makefile
+++ b/diskdev_cmds/repquota.tproj/Makefile
@@ -1,4 +1,6 @@
 PROG=  repquota
 MAN=   repquota.8
 
+BINDIR=/usr/sbin
+
 .include <bsd.prog.mk>

diff --git a/diskdev_cmds/setclass.tproj/Makefile b/diskdev_cmds/setclass.tproj/Makefile
index d8d1d79b5cc279e9d27d1f2cbbcbefe24e601d3a..e9b7c866c2640d2b90cb37981d882366a7cee13f 100644 (file)
--- a/diskdev_cmds/setclass.tproj/Makefile
+++ b/diskdev_cmds/setclass.tproj/Makefile
@@ -1,4 +1,6 @@
 PROG=  setclass
 MAN=   setclass.8
 
+BINDIR=/sbin
+
 .include <bsd.prog.mk>

diff --git a/diskdev_cmds/vndevice.tproj/Makefile b/diskdev_cmds/vndevice.tproj/Makefile
index 9f1583d14d634780224f8c251a55182ff5e6aee6..740631dcf04ba6937622a8cc4eb556987f224b17 100644 (file)
--- a/diskdev_cmds/vndevice.tproj/Makefile
+++ b/diskdev_cmds/vndevice.tproj/Makefile
@@ -1,4 +1,6 @@
 PROG=  vndevice
 MAN=
 
+BINDIR=/sbin
+
 .include <bsd.prog.mk>

diff --git a/diskdev_cmds/vsdbutil.tproj/Makefile b/diskdev_cmds/vsdbutil.tproj/Makefile
index 94a8db6395a96df3f07cdd008e09abae39b77f4b..5d5a95f931e7acfb03039e9ce720e2dad916f67c 100644 (file)
--- a/diskdev_cmds/vsdbutil.tproj/Makefile
+++ b/diskdev_cmds/vsdbutil.tproj/Makefile
@@ -5,4 +5,6 @@ SRCS=   vsdbutil_main.c \
 
 .PATH: ${.CURDIR}/../mount_flags_dir
 
+BINDIR=/usr/sbin
+
 .include <bsd.prog.mk>