aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCameron Katri <me@cameronkatri.com>2021-05-13 16:20:18 -0400
committerCameron Katri <me@cameronkatri.com>2021-05-13 16:20:18 -0400
commit0304b5d610d6c9771137a2845ebefadedc5b9541 (patch)
tree3379f40715b6d8f0d14af1e6c77257bd05e1377d
parentf333eb0b5e7183833e6eae43195764388d32fe21 (diff)
downloadapple_cmds-0304b5d610d6c9771137a2845ebefadedc5b9541.tar.gz
apple_cmds-0304b5d610d6c9771137a2845ebefadedc5b9541.tar.zst
apple_cmds-0304b5d610d6c9771137a2845ebefadedc5b9541.zip
file_cmds: Fix BINDIRs again
-rw-r--r--file_cmds/chflags/Makefile2
-rw-r--r--file_cmds/cksum/Makefile2
-rw-r--r--file_cmds/compress/Makefile4
-rw-r--r--file_cmds/du/Makefile2
-rw-r--r--file_cmds/ipcrm/Makefile2
-rw-r--r--file_cmds/ipcs/Makefile2
-rw-r--r--file_cmds/ln/Makefile3
-rw-r--r--file_cmds/mkfifo/Makefile2
-rw-r--r--file_cmds/pathchk/Makefile2
-rw-r--r--file_cmds/rm/Makefile2
-rw-r--r--file_cmds/rmt/Makefile2
-rw-r--r--file_cmds/shar/Makefile2
-rw-r--r--file_cmds/stat/Makefile2
-rw-r--r--file_cmds/touch/Makefile2
14 files changed, 8 insertions, 23 deletions
diff --git a/file_cmds/chflags/Makefile b/file_cmds/chflags/Makefile
index a734b6e..287e327 100644
--- a/file_cmds/chflags/Makefile
+++ b/file_cmds/chflags/Makefile
@@ -1,5 +1,3 @@
PROG= chflags
-BINDIR=/bin
-
.include <bsd.prog.mk>
diff --git a/file_cmds/cksum/Makefile b/file_cmds/cksum/Makefile
index be7aebe..be8950d 100644
--- a/file_cmds/cksum/Makefile
+++ b/file_cmds/cksum/Makefile
@@ -7,6 +7,6 @@ SRCS= cksum.c \
sum1.c \
sum2.c
-BINDIR=/bin
+LINKS+= ${BINDIR}/cksum ${BINDIR}/sum
.include <bsd.prog.mk>
diff --git a/file_cmds/compress/Makefile b/file_cmds/compress/Makefile
index 9f2f16a..1dba0de 100644
--- a/file_cmds/compress/Makefile
+++ b/file_cmds/compress/Makefile
@@ -3,6 +3,8 @@ MAN= compress.1 uncompress.1 zopen.3
SRCS= compress.c zopen.c
SCRIPTS= zcat.sh
-BINDIR=/bin
+BINDIR=/usr/bin
+
+LINKS+= ${BINDIR}/compress ${BINDIR}/uncompress
.include <bsd.prog.mk>
diff --git a/file_cmds/du/Makefile b/file_cmds/du/Makefile
index c406829..ab61aa3 100644
--- a/file_cmds/du/Makefile
+++ b/file_cmds/du/Makefile
@@ -1,5 +1,3 @@
PROG= du
-BINDIR=/bin
-
.include <bsd.prog.mk>
diff --git a/file_cmds/ipcrm/Makefile b/file_cmds/ipcrm/Makefile
index 1c314ad..c3dc182 100644
--- a/file_cmds/ipcrm/Makefile
+++ b/file_cmds/ipcrm/Makefile
@@ -1,5 +1,3 @@
PROG= ipcrm
-BINDIR=/bin
-
.include <bsd.prog.mk>
diff --git a/file_cmds/ipcs/Makefile b/file_cmds/ipcs/Makefile
index 4ed7df4..1d79542 100644
--- a/file_cmds/ipcs/Makefile
+++ b/file_cmds/ipcs/Makefile
@@ -2,6 +2,4 @@ PROG= ipcs
CFLAGS+=-Duser32_time_t=user_time_t -Duser32_addr_t=user_addr_t -Duser64_time_t=user_time_t
-BINDIR=/bin
-
.include <bsd.prog.mk>
diff --git a/file_cmds/ln/Makefile b/file_cmds/ln/Makefile
index 8a22b20..db89bfa 100644
--- a/file_cmds/ln/Makefile
+++ b/file_cmds/ln/Makefile
@@ -1,7 +1,6 @@
PROG= ln
MAN= link.1 ln.1 symlink.7
-LINKS= ${BINDIR}/ln ${BINDIR}/link
-
BINDIR=/bin
+LINKS= ${BINDIR}/ln ${BINDIR}/link
.include <bsd.prog.mk>
diff --git a/file_cmds/mkfifo/Makefile b/file_cmds/mkfifo/Makefile
index 45542b9..aa19b2a 100644
--- a/file_cmds/mkfifo/Makefile
+++ b/file_cmds/mkfifo/Makefile
@@ -1,5 +1,3 @@
PROG= mkfifo
-BINDIR=/bin
-
.include <bsd.prog.mk>
diff --git a/file_cmds/pathchk/Makefile b/file_cmds/pathchk/Makefile
index 97d4b20..a3ea46c 100644
--- a/file_cmds/pathchk/Makefile
+++ b/file_cmds/pathchk/Makefile
@@ -1,5 +1,3 @@
PROG= pathchk
-BINDIR=/bin
-
.include <bsd.prog.mk>
diff --git a/file_cmds/rm/Makefile b/file_cmds/rm/Makefile
index 42c32c7..c20e93e 100644
--- a/file_cmds/rm/Makefile
+++ b/file_cmds/rm/Makefile
@@ -3,4 +3,6 @@ MAN= rm.1 unlink.1
BINDIR=/bin
+LINKS+= ${BINDIR}/rm ${BINDIR}/unlink
+
.include <bsd.prog.mk>
diff --git a/file_cmds/rmt/Makefile b/file_cmds/rmt/Makefile
index 8d058d6..1e515ee 100644
--- a/file_cmds/rmt/Makefile
+++ b/file_cmds/rmt/Makefile
@@ -1,6 +1,4 @@
PROG= rmt
MAN= rmt.8
-BINDIR=/bin
-
.include <bsd.prog.mk>
diff --git a/file_cmds/shar/Makefile b/file_cmds/shar/Makefile
index d7288d3..261ee43 100644
--- a/file_cmds/shar/Makefile
+++ b/file_cmds/shar/Makefile
@@ -1,6 +1,4 @@
SCRIPTS= shar.sh
MAN= shar.1
-BINDIR=/bin
-
.include <bsd.prog.mk>
diff --git a/file_cmds/stat/Makefile b/file_cmds/stat/Makefile
index b07de81..28b769e 100644
--- a/file_cmds/stat/Makefile
+++ b/file_cmds/stat/Makefile
@@ -1,6 +1,6 @@
PROG= stat
MAN= readlink.1 stat.1
-BINDIR=/bin
+LINKS+= ${BINDIR}/stat ${BINDIR}/readlink
.include <bsd.prog.mk>
diff --git a/file_cmds/touch/Makefile b/file_cmds/touch/Makefile
index 2dd708a..fcb8859 100644
--- a/file_cmds/touch/Makefile
+++ b/file_cmds/touch/Makefile
@@ -1,5 +1,3 @@
PROG= touch
-BINDIR=/bin
-
.include <bsd.prog.mk>