From e585f78db8bdf997d3864b5d71f0fe54612911e8 Mon Sep 17 00:00:00 2001 From: Cameron Katri Date: Wed, 12 May 2021 17:55:23 -0400 Subject: diskdev_cmds: Fix BINDIRs --- diskdev_cmds/dev_mkdb.tproj/Makefile | 2 ++ diskdev_cmds/edquota.tproj/Makefile | 2 ++ diskdev_cmds/fdisk.tproj/Makefile | 2 ++ diskdev_cmds/fsck.tproj/Makefile | 2 ++ diskdev_cmds/fuser.tproj/Makefile | 2 ++ diskdev_cmds/mount.tproj/Makefile | 2 ++ diskdev_cmds/mount_devfs.tproj/Makefile | 2 ++ diskdev_cmds/mount_fdesc.tproj/Makefile | 2 ++ diskdev_cmds/quota.tproj/Makefile | 2 ++ diskdev_cmds/quotacheck.tproj/Makefile | 6 +++--- diskdev_cmds/quotaon.tproj/Makefile | 4 ++++ diskdev_cmds/repquota.tproj/Makefile | 2 ++ diskdev_cmds/setclass.tproj/Makefile | 2 ++ diskdev_cmds/vndevice.tproj/Makefile | 2 ++ diskdev_cmds/vsdbutil.tproj/Makefile | 2 ++ 15 files changed, 33 insertions(+), 3 deletions(-) diff --git a/diskdev_cmds/dev_mkdb.tproj/Makefile b/diskdev_cmds/dev_mkdb.tproj/Makefile index 2871183..141726f 100644 --- 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 diff --git a/diskdev_cmds/edquota.tproj/Makefile b/diskdev_cmds/edquota.tproj/Makefile index c45697f..5d063c1 100644 --- 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 diff --git a/diskdev_cmds/fdisk.tproj/Makefile b/diskdev_cmds/fdisk.tproj/Makefile index c4b5f79..a623892 100644 --- 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 diff --git a/diskdev_cmds/fsck.tproj/Makefile b/diskdev_cmds/fsck.tproj/Makefile index 8ac15de..445c335 100644 --- 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 diff --git a/diskdev_cmds/fuser.tproj/Makefile b/diskdev_cmds/fuser.tproj/Makefile index a7ea1b6..19b1df9 100644 --- a/diskdev_cmds/fuser.tproj/Makefile +++ b/diskdev_cmds/fuser.tproj/Makefile @@ -1,3 +1,5 @@ SCRIPTS= fuser.pl +BINDIR=/usr/bin + .include diff --git a/diskdev_cmds/mount.tproj/Makefile b/diskdev_cmds/mount.tproj/Makefile index cc671bf..172c51d 100644 --- a/diskdev_cmds/mount.tproj/Makefile +++ b/diskdev_cmds/mount.tproj/Makefile @@ -1,3 +1,5 @@ MAN= fstab.5 +BINDIR=/sbin + .include diff --git a/diskdev_cmds/mount_devfs.tproj/Makefile b/diskdev_cmds/mount_devfs.tproj/Makefile index d1d34aa..3f4c03c 100644 --- a/diskdev_cmds/mount_devfs.tproj/Makefile +++ b/diskdev_cmds/mount_devfs.tproj/Makefile @@ -3,4 +3,6 @@ MAN= LDADD=-lutil +BINDIR=/sbin + .include diff --git a/diskdev_cmds/mount_fdesc.tproj/Makefile b/diskdev_cmds/mount_fdesc.tproj/Makefile index ac71999..7ed9671 100644 --- 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 diff --git a/diskdev_cmds/quota.tproj/Makefile b/diskdev_cmds/quota.tproj/Makefile index 6cf0042..ba137fe 100644 --- 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 diff --git a/diskdev_cmds/quotacheck.tproj/Makefile b/diskdev_cmds/quotacheck.tproj/Makefile index cc09b67..b90f20e 100644 --- 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 diff --git a/diskdev_cmds/quotaon.tproj/Makefile b/diskdev_cmds/quotaon.tproj/Makefile index 7ab7ff7..8cda80c 100644 --- 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 diff --git a/diskdev_cmds/repquota.tproj/Makefile b/diskdev_cmds/repquota.tproj/Makefile index f86e6f8..0cc629b 100644 --- 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 diff --git a/diskdev_cmds/setclass.tproj/Makefile b/diskdev_cmds/setclass.tproj/Makefile index d8d1d79..e9b7c86 100644 --- a/diskdev_cmds/setclass.tproj/Makefile +++ b/diskdev_cmds/setclass.tproj/Makefile @@ -1,4 +1,6 @@ PROG= setclass MAN= setclass.8 +BINDIR=/sbin + .include diff --git a/diskdev_cmds/vndevice.tproj/Makefile b/diskdev_cmds/vndevice.tproj/Makefile index 9f1583d..740631d 100644 --- a/diskdev_cmds/vndevice.tproj/Makefile +++ b/diskdev_cmds/vndevice.tproj/Makefile @@ -1,4 +1,6 @@ PROG= vndevice MAN= +BINDIR=/sbin + .include diff --git a/diskdev_cmds/vsdbutil.tproj/Makefile b/diskdev_cmds/vsdbutil.tproj/Makefile index 94a8db6..5d5a95f 100644 --- 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 -- cgit v1.2.3-56-ge451