From: Peter Avalos <pavalos@theshell.com>
Date: Sun, 21 Jun 2009 18:26:30 +0000 (-1000)
Subject: Merge branch 'vendor/LESS'
X-Git-Url: https://gitweb.dragonflybsd.org/~josepht/dragonfly.git/commitdiff_plain/e3a54cafc1b28884c1c773af830a27bd630d122e

Merge branch 'vendor/LESS'
---

e3a54cafc1b28884c1c773af830a27bd630d122e
diff --cc contrib/less/README.DELETED
index 857ed04601,0000000000..857ed04601
mode 100644,000000..100644
--- a/contrib/less/README.DELETED
+++ b/contrib/less/README.DELETED
diff --cc contrib/less/README.DRAGONFLY
index f1cf4c5506,0000000000..f1cf4c5506
mode 100644,000000..100644
--- a/contrib/less/README.DRAGONFLY
+++ b/contrib/less/README.DRAGONFLY
diff --cc usr.bin/less/Makefile.common
index 651d7603a2,0000000000..9d339a8d5a
mode 100644,000000..100644
--- a/usr.bin/less/Makefile.common
+++ b/usr.bin/less/Makefile.common
@@@ -1,13 -1,0 +1,13 @@@
 +# $FreeBSD: src/usr.bin/less/Makefile.common,v 1.3.2.1 2000/06/30 01:03:15 ps Exp $
 +# $DragonFly: src/usr.bin/less/Makefile.common,v 1.9 2007/10/09 23:37:39 pavalos Exp $
 +
- LSDIR=	${.CURDIR}/../../contrib/less-4
++LSDIR=	${.CURDIR}/../../contrib/less
 +.PATH:	${LSDIR}
 +
 +CFLAGS+=-I${.CURDIR}/../less -I${LSDIR}
 +WARNS?=	1
 +
 +.SUFFIXES: .nro .1
 +
 +.nro.1:
 +	${LN} -s ${.IMPSRC} ${.TARGET}