From 81ae6b634188151371634647a3013b8571497844 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Sat, 3 Jun 2000 11:39:38 +0000
Subject: [PATCH] Fixed some style bugs.  Apart from formatting bugs, MANDEPEND
 is deprecated and $< and $@ are even documented as deprecated.

---
 usr.bin/less/Makefile        | 11 ++---------
 usr.bin/less/Makefile.common | 10 +++-------
 usr.bin/lessecho/Makefile    |  3 ---
 usr.bin/lesskey/Makefile     |  7 +------
 4 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/usr.bin/less/Makefile b/usr.bin/less/Makefile
index ceb99641c0ab..e0e25c24d81b 100644
--- a/usr.bin/less/Makefile
+++ b/usr.bin/less/Makefile
@@ -1,5 +1,3 @@
-# Makefile for less
-#
 # $FreeBSD$
 
 PROG=	less
@@ -9,14 +7,9 @@ SRCS=	main.c screen.c brac.c ch.c charset.c cmdbuf.c command.c decode.c \
 	position.c prompt.c search.c signal.c tags.c ttyin.c version.c
 DPADD=	${LIBNCURSES}
 LDADD=	-lncurses
-
 LINKS=	${BINDIR}/less /usr/bin/more
-
-MAN1=	less.1
-MANDEPEND=	less.1
-CLEANFILES+=	${MANDEPEND}
-
-MLINKS= less.1 more.1
+MLINKS=	less.1 more.1
+CLEANFILES= ${MAN1}
 
 .include "Makefile.common"
 .include <bsd.prog.mk>
diff --git a/usr.bin/less/Makefile.common b/usr.bin/less/Makefile.common
index becb0e68ebe7..6b3b62b97dab 100644
--- a/usr.bin/less/Makefile.common
+++ b/usr.bin/less/Makefile.common
@@ -1,15 +1,11 @@
-# Makefile.common for less
-#
 # $FreeBSD$
 
 LSDIR=	${.CURDIR}/../../contrib/less
 .PATH:	${LSDIR}
 
-CFLAGS+=-I. -I${.CURDIR}/../less -I${LSDIR}
+CFLAGS+=-I${.CURDIR}/../less -I${LSDIR}
 
-.SUFFIXES:	.nro .1
+.SUFFIXES: .nro .1
 
 .nro.1:
-	@${ECHO} Making $@ from $<
-	@-rm -f $@
-	@cp $< $@
+	ln -s ${.IMPSRC} ${.TARGET}
diff --git a/usr.bin/lessecho/Makefile b/usr.bin/lessecho/Makefile
index 64e9cdac24d5..bfe81d61f9c3 100644
--- a/usr.bin/lessecho/Makefile
+++ b/usr.bin/lessecho/Makefile
@@ -1,10 +1,7 @@
-# Makefile for lessecho
-#
 # $FreeBSD$
 
 PROG=	lessecho
 SRCS=	lessecho.c version.c
-
 NOMAN=
 
 .include "${.CURDIR}/../less/Makefile.common"
diff --git a/usr.bin/lesskey/Makefile b/usr.bin/lesskey/Makefile
index 3c9de9f15b02..5c80cc607116 100644
--- a/usr.bin/lesskey/Makefile
+++ b/usr.bin/lesskey/Makefile
@@ -1,13 +1,8 @@
-# Makefile for lesskey
-#
 # $FreeBSD$
 
 PROG=	lesskey
 SRCS=	lesskey.c version.c
-
-MAN1=	lesskey.1
-MANDEPEND=	lesskey.1
-CLEANFILES+=	${MANDEPEND}
+CLEANFILES= ${MAN1}
 
 .include "${.CURDIR}/../less/Makefile.common"
 .include <bsd.prog.mk>