file_cmds: Fix BINDIRs again

diff --git a/file_cmds/chflags/Makefile b/file_cmds/chflags/Makefile
index a734b6e5e66ba8b8b35d3253aa26b87de8c13129..287e327d4a9808046cc2467f71187a4d35bcb41e 100644 (file)
--- 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 be7aebe31d5a192e70291e7631b54626dc95bf11..be8950d5c7b5a6248c36086bd7ccb4875efd99b0 100644 (file)
--- 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 9f2f16a60728751af4e9a449b54400c20a7f0450..1dba0de308fed8435157302dae6d38b820c76021 100644 (file)
--- 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 c4068296c21634601320434b11fe8502bcf263ae..ab61aa3b0ef753bc1b6b71548b26f657195c075e 100644 (file)
--- 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 1c314ad125e9434307a585efe6e5c7077af2afcb..c3dc182c88c2640a6d72c3cb16ab23db92d91e0a 100644 (file)
--- 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 4ed7df428db5d26148b8a9fad0247cbe8b8afd23..1d79542b332aa250116bcd68e899ba8102b8ae1e 100644 (file)
--- 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 8a22b20d9ad1c4d6b64de600f7630a489f6da982..db89bfa648473061ae9a58a48306c8574f71ec68 100644 (file)
--- 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 45542b9bc5d2a3989adfef11d7f490feeb5a461b..aa19b2abf75871a76dec377636b368fbcb7de922 100644 (file)
--- 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 97d4b20417e39b2ea8339100fc24e7550b79a75d..a3ea46c30c5f104d36abe6841f3e99fc9e3a9a44 100644 (file)
--- 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 42c32c7ef143370c4414785c71ec98183177681d..c20e93ebf45689f54b13a870fec8fca159e85e85 100644 (file)
--- 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 8d058d6b1ea21099f62e4ad16cc9298842bc836b..1e515eea38c78e18bd42ad317b29064f53628d29 100644 (file)
--- 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 d7288d3dec1a30a20431de1b8ffb6dbd4104b941..261ee4369f912de48a35b336b11b109dcdcfc44d 100644 (file)
--- 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 b07de81d8738ef7e8837eecc88b83fa025638797..28b769e3a8fcdaea271e361611bd5ab27f6a347e 100644 (file)
--- 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 2dd708a1ba2d7327857d9de811506823c602fcf0..fcb8859cf7722f22bde1ac8466873bf46f4e2cca 100644 (file)
--- a/file_cmds/touch/Makefile
+++ b/file_cmds/touch/Makefile
@@ -1,5 +1,3 @@
 PROG=  touch
 
-BINDIR=/bin
-
 .include <bsd.prog.mk>