socsvn commit: r271837 - soc2014/zkorchev/freebsd_head/bin/ls

[zkorchev at FreeBSD.org]

Author: zkorchev
Date: Mon Aug  4 09:30:19 2014
New Revision: 271837
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271837

Log:
  removed outdated ls usage option; fixed Makefile

Modified:
  soc2014/zkorchev/freebsd_head/bin/ls/Makefile
  soc2014/zkorchev/freebsd_head/bin/ls/ls.c

Modified: soc2014/zkorchev/freebsd_head/bin/ls/Makefile
==============================================================================
--- soc2014/zkorchev/freebsd_head/bin/ls/Makefile	Mon Aug  4 09:29:48 2014	(r271836)
+++ soc2014/zkorchev/freebsd_head/bin/ls/Makefile	Mon Aug  4 09:30:19 2014	(r271837)
@@ -6,8 +6,8 @@
 PROG=	ls
 SRCS=	cmp.c ls.c print.c util.c
 DPADD=	${LIBUTIL}
-LDADD= -L/usr/local/lib -lutil -lsol
-CFLAGS+= -DSOL_ON -I/usr/local/include -Wno-format-invalid-specifier
+LDADD= -lutil -lsol
+CFLAGS+= -DSOL_ON -Wno-format-invalid-specifier
 
 .if !defined(RELEASE_CRUNCH) && \
 	${MK_LS_COLORS} != no

Modified: soc2014/zkorchev/freebsd_head/bin/ls/ls.c
==============================================================================
--- soc2014/zkorchev/freebsd_head/bin/ls/ls.c	Mon Aug  4 09:29:48 2014	(r271836)
+++ soc2014/zkorchev/freebsd_head/bin/ls/ls.c	Mon Aug  4 09:30:19 2014	(r271837)
@@ -196,7 +196,7 @@
 	if (getenv("LS_SAMESORT"))
 		f_samesort = 1;
 	while ((ch = getopt(argc, argv,
-	    "1ABCD:FGHILOPRSTUWXZabcdfghiklmnopqrstuwxy,")) != -1) {
+	    "1ABCD:FGHILPRSTUWXZabcdfghiklmnopqrstuwxy,")) != -1) {
 		switch (ch) {
 		/*
 		 * The -1, -C, -x and -l options all override each other so