From fced92c5c97fdd9c73c4ea81ef4a14592af6003e Mon Sep 17 00:00:00 2001 From: Cameron Katri Date: Wed, 12 May 2021 17:58:45 -0400 Subject: [PATCH] file_cmds: Fix BINDIRs, mtree enable algs --- file_cmds/chflags/Makefile | 2 ++ file_cmds/chmod/Makefile | 2 ++ file_cmds/cksum/Makefile | 2 ++ file_cmds/compress/Makefile | 2 ++ file_cmds/cp/Makefile | 2 ++ file_cmds/dd/Makefile | 2 ++ file_cmds/df/Makefile | 2 ++ file_cmds/du/Makefile | 2 ++ file_cmds/gzip/Makefile | 2 ++ file_cmds/install/Makefile | 2 ++ file_cmds/ipcrm/Makefile | 2 ++ file_cmds/ipcs/Makefile | 2 ++ file_cmds/ln/Makefile | 2 ++ file_cmds/ls/Makefile | 2 ++ file_cmds/mkdir/Makefile | 2 ++ file_cmds/mkfifo/Makefile | 2 ++ file_cmds/mknod/Makefile | 2 ++ file_cmds/mtree/Makefile | 3 +++ file_cmds/mv/Makefile | 2 ++ file_cmds/pathchk/Makefile | 2 ++ file_cmds/pax/Makefile | 2 ++ file_cmds/rm/Makefile | 2 ++ file_cmds/rmdir/Makefile | 2 ++ file_cmds/rmt/Makefile | 2 ++ file_cmds/shar/Makefile | 2 ++ file_cmds/stat/Makefile | 2 ++ file_cmds/touch/Makefile | 2 ++ 27 files changed, 55 insertions(+) diff --git a/file_cmds/chflags/Makefile b/file_cmds/chflags/Makefile index 287e327..a734b6e 100644 --- a/file_cmds/chflags/Makefile +++ b/file_cmds/chflags/Makefile @@ -1,3 +1,5 @@ PROG= chflags +BINDIR=/bin + .include diff --git a/file_cmds/chmod/Makefile b/file_cmds/chmod/Makefile index c134e4a..0815c98 100644 --- a/file_cmds/chmod/Makefile +++ b/file_cmds/chmod/Makefile @@ -2,4 +2,6 @@ PROG= chmod SRCS= chmod.c \ chmod_acl.c +BINDIR=/bin + .include diff --git a/file_cmds/cksum/Makefile b/file_cmds/cksum/Makefile index c5c38fa..be7aebe 100644 --- a/file_cmds/cksum/Makefile +++ b/file_cmds/cksum/Makefile @@ -7,4 +7,6 @@ SRCS= cksum.c \ sum1.c \ sum2.c +BINDIR=/bin + .include diff --git a/file_cmds/compress/Makefile b/file_cmds/compress/Makefile index 2f87c36..9f2f16a 100644 --- a/file_cmds/compress/Makefile +++ b/file_cmds/compress/Makefile @@ -3,4 +3,6 @@ MAN= compress.1 uncompress.1 zopen.3 SRCS= compress.c zopen.c SCRIPTS= zcat.sh +BINDIR=/bin + .include diff --git a/file_cmds/cp/Makefile b/file_cmds/cp/Makefile index e5fb6a8..492fb0d 100644 --- a/file_cmds/cp/Makefile +++ b/file_cmds/cp/Makefile @@ -1,4 +1,6 @@ PROG= cp SRCS= cp.c utils.c +BINDIR=/bin + .include diff --git a/file_cmds/dd/Makefile b/file_cmds/dd/Makefile index 7e90f72..72f3c3a 100644 --- a/file_cmds/dd/Makefile +++ b/file_cmds/dd/Makefile @@ -1,4 +1,6 @@ PROG= dd SRCS= args.c conv_tab.c conv.c dd.c misc.c position.c +BINDIR=/bin + .include diff --git a/file_cmds/df/Makefile b/file_cmds/df/Makefile index 5d8456d..346654f 100644 --- a/file_cmds/df/Makefile +++ b/file_cmds/df/Makefile @@ -3,4 +3,6 @@ SRCS= df.c vfslist.c LDADD=-lutil +BINDIR=/bin + .include diff --git a/file_cmds/du/Makefile b/file_cmds/du/Makefile index ab61aa3..c406829 100644 --- a/file_cmds/du/Makefile +++ b/file_cmds/du/Makefile @@ -1,3 +1,5 @@ PROG= du +BINDIR=/bin + .include diff --git a/file_cmds/gzip/Makefile b/file_cmds/gzip/Makefile index 760cb20..077473c 100644 --- a/file_cmds/gzip/Makefile +++ b/file_cmds/gzip/Makefile @@ -12,4 +12,6 @@ SCRIPTS= gzexe \ CFLAGS+=-DGZIP_APPLE_VERSION=\"321.40.3\" LDADD=-llzma -lz -lbz2 +BINDIR=/bin + .include diff --git a/file_cmds/install/Makefile b/file_cmds/install/Makefile index 41bdd0d..9513e0e 100644 --- a/file_cmds/install/Makefile +++ b/file_cmds/install/Makefile @@ -1,4 +1,6 @@ PROG= install SRCS= xinstall.c +BINDIR=/bin + .include diff --git a/file_cmds/ipcrm/Makefile b/file_cmds/ipcrm/Makefile index c3dc182..1c314ad 100644 --- a/file_cmds/ipcrm/Makefile +++ b/file_cmds/ipcrm/Makefile @@ -1,3 +1,5 @@ PROG= ipcrm +BINDIR=/bin + .include diff --git a/file_cmds/ipcs/Makefile b/file_cmds/ipcs/Makefile index b26436a..02c7fba 100644 --- a/file_cmds/ipcs/Makefile +++ b/file_cmds/ipcs/Makefile @@ -1,3 +1,5 @@ PROG= ipcs +BINDIR=/bin + .include diff --git a/file_cmds/ln/Makefile b/file_cmds/ln/Makefile index 674541a..8a22b20 100644 --- a/file_cmds/ln/Makefile +++ b/file_cmds/ln/Makefile @@ -2,4 +2,6 @@ PROG= ln MAN= link.1 ln.1 symlink.7 LINKS= ${BINDIR}/ln ${BINDIR}/link +BINDIR=/bin + .include diff --git a/file_cmds/ls/Makefile b/file_cmds/ls/Makefile index 8edb47a..b3318b1 100644 --- a/file_cmds/ls/Makefile +++ b/file_cmds/ls/Makefile @@ -3,4 +3,6 @@ SRCS= cmp.c ls.c print.c util.c LDADD=-lutil +BINDIR=/bin + .include diff --git a/file_cmds/mkdir/Makefile b/file_cmds/mkdir/Makefile index baa4bc3..ea70b14 100644 --- a/file_cmds/mkdir/Makefile +++ b/file_cmds/mkdir/Makefile @@ -1,3 +1,5 @@ PROG= mkdir +BINDIR=/bin + .include diff --git a/file_cmds/mkfifo/Makefile b/file_cmds/mkfifo/Makefile index aa19b2a..45542b9 100644 --- a/file_cmds/mkfifo/Makefile +++ b/file_cmds/mkfifo/Makefile @@ -1,3 +1,5 @@ PROG= mkfifo +BINDIR=/bin + .include diff --git a/file_cmds/mknod/Makefile b/file_cmds/mknod/Makefile index 0eae59b..04efea7 100644 --- a/file_cmds/mknod/Makefile +++ b/file_cmds/mknod/Makefile @@ -1,4 +1,6 @@ PROG= mknod MAN= mknod.8 +BINDIR=/sbin + .include diff --git a/file_cmds/mtree/Makefile b/file_cmds/mtree/Makefile index e9cf4f2..177c7e8 100644 --- a/file_cmds/mtree/Makefile +++ b/file_cmds/mtree/Makefile @@ -14,6 +14,9 @@ SRCS= commoncrypto.c \ .PATH: ${.CURDIR}/../cksum +CFLAGS+=-DENABLE_MD5 -DENABLE_RMD160 -DENABLE_SHA1 -DENABLE_SHA256 LDADD=-framework CoreFoundation +BINDIR=/usr/sbin + .include diff --git a/file_cmds/mv/Makefile b/file_cmds/mv/Makefile index b7be72c..01d3542 100644 --- a/file_cmds/mv/Makefile +++ b/file_cmds/mv/Makefile @@ -1,3 +1,5 @@ PROG= mv +BINDIR=/bin + .include diff --git a/file_cmds/pathchk/Makefile b/file_cmds/pathchk/Makefile index a3ea46c..97d4b20 100644 --- a/file_cmds/pathchk/Makefile +++ b/file_cmds/pathchk/Makefile @@ -1,3 +1,5 @@ PROG= pathchk +BINDIR=/bin + .include diff --git a/file_cmds/pax/Makefile b/file_cmds/pax/Makefile index fe5902c..5d3dbdc 100644 --- a/file_cmds/pax/Makefile +++ b/file_cmds/pax/Makefile @@ -18,4 +18,6 @@ SRCS= ar_io.c \ tar.c \ tty_subs.c +BINDIR=/bin + .include diff --git a/file_cmds/rm/Makefile b/file_cmds/rm/Makefile index 29b0c5b..42c32c7 100644 --- a/file_cmds/rm/Makefile +++ b/file_cmds/rm/Makefile @@ -1,4 +1,6 @@ PROG= rm MAN= rm.1 unlink.1 +BINDIR=/bin + .include diff --git a/file_cmds/rmdir/Makefile b/file_cmds/rmdir/Makefile index a05d665..e54393e 100644 --- a/file_cmds/rmdir/Makefile +++ b/file_cmds/rmdir/Makefile @@ -1,3 +1,5 @@ PROG= rmdir +BINDIR=/bin + .include diff --git a/file_cmds/rmt/Makefile b/file_cmds/rmt/Makefile index 1e515ee..8d058d6 100644 --- a/file_cmds/rmt/Makefile +++ b/file_cmds/rmt/Makefile @@ -1,4 +1,6 @@ PROG= rmt MAN= rmt.8 +BINDIR=/bin + .include diff --git a/file_cmds/shar/Makefile b/file_cmds/shar/Makefile index 261ee43..d7288d3 100644 --- a/file_cmds/shar/Makefile +++ b/file_cmds/shar/Makefile @@ -1,4 +1,6 @@ SCRIPTS= shar.sh MAN= shar.1 +BINDIR=/bin + .include diff --git a/file_cmds/stat/Makefile b/file_cmds/stat/Makefile index 71d9ee0..b07de81 100644 --- a/file_cmds/stat/Makefile +++ b/file_cmds/stat/Makefile @@ -1,4 +1,6 @@ PROG= stat MAN= readlink.1 stat.1 +BINDIR=/bin + .include diff --git a/file_cmds/touch/Makefile b/file_cmds/touch/Makefile index fcb8859..2dd708a 100644 --- a/file_cmds/touch/Makefile +++ b/file_cmds/touch/Makefile @@ -1,3 +1,5 @@ PROG= touch +BINDIR=/bin + .include -- 2.47.1