file_cmds: Fix install and COLORLS

diff --git a/file_cmds/Makefile b/file_cmds/Makefile
index d1f3031bca7add2f74998aacb434fd9b84ac365f..44e87bbb1247f2d063f61468b5b30ab4a96acc9f 100644 (file)
--- a/file_cmds/Makefile
+++ b/file_cmds/Makefile
@@ -8,7 +8,6 @@ SUBDIR= chflags \
        df \
        du \
        gzip \
-       install \
        ipcrm \
        ipcs \
        ln \
@@ -25,6 +24,7 @@ SUBDIR=       chflags \
        rmt \
        shar \
        stat \
-       touch
+       touch \
+       xinstall
 
 .include <bsd.subdir.mk>

diff --git a/file_cmds/install/Makefile b/file_cmds/install/Makefile
index 9513e0ee7ebca6a056df9d935c1181d05de79101..3116d07f97718b7db288dc2bfe15245880bdd9cc 100644 (file)
--- a/file_cmds/install/Makefile
+++ b/file_cmds/install/Makefile
@@ -1,6 +1,9 @@
-PROG=  install
-SRCS=  xinstall.c
+#      @(#)Makefile    8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
-BINDIR=/bin
+PROG=          xinstall
+PROGNAME=      install
+SRCS=          xinstall.c
+MAN=           install.1
 
 .include <bsd.prog.mk>

diff --git a/file_cmds/ls/Makefile b/file_cmds/ls/Makefile
index b3318b1d8a6f5a7d69ff8c74cda351e79f9090f9..2872cbe6d040208160cccc1926a7ffbb168505c3 100644 (file)
--- a/file_cmds/ls/Makefile
+++ b/file_cmds/ls/Makefile
@@ -1,7 +1,9 @@
 PROG=  ls
 SRCS=  cmp.c ls.c print.c util.c
 
-LDADD=-lutil
+CFLAGS+=-DCOLORLS
+
+LDADD=-lutil -lncursesw
 
 BINDIR=/bin
 

diff --git a/file_cmds/xinstall b/file_cmds/xinstall
new file mode 120000 (symlink)
index 0000000..f7ffc47
--- /dev/null
+++ b/file_cmds/xinstall
@@ -0,0 +1 @@
+install
\ No newline at end of file