From 2a3a31d8cad77fb945ea35065108aaf566da742c Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Thu, 18 Feb 1999 18:56:58 +0000
Subject: [PATCH] More style fixes to bring this almost to bde's suggested
 version.

---
 sbin/dhclient/Makefile | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/sbin/dhclient/Makefile b/sbin/dhclient/Makefile
index 95496a7fe83b..0fc8b1c1758b 100644
--- a/sbin/dhclient/Makefile
+++ b/sbin/dhclient/Makefile
@@ -1,26 +1,22 @@
-#
-# $Id: Makefile,v 1.1.1.1 1999/02/10 20:51:22 obrien Exp $
-#
+#	$Id$
 
-DIST_DIR=	${.CURDIR}/../../contrib/isc-dhcp
+DIST_DIR= ${.CURDIR}/../../contrib/isc-dhcp
 
-.PATH:		${DIST_DIR}/client ${DIST_DIR}/common
+.PATH: ${DIST_DIR}/client ${DIST_DIR}/common
 
-PROG=		dhclient
+PROG=	dhclient
+SRCS=	clparse.c dhclient.c
+SRCS+=	alloc.c bpf.c conflex.c convert.c dispatch.c errwarn.c hash.c \
+	icmp.c inet.c inet_addr.c memory.c nit.c options.c packet.c \
+	parse.c print.c raw.c socket.c tables.c tree.c upf.c
 
-SRCS=		clparse.c dhclient.c
-SRCS+=		alloc.c bpf.c conflex.c convert.c dispatch.c errwarn.c hash.c \
-		icmp.c inet.c inet_addr.c memory.c nit.c options.c packet.c \
-		parse.c print.c raw.c socket.c tables.c tree.c upf.c
+CFLAGS+= -I${DIST_DIR}/includes -I${DIST_DIR}
 
-CFLAGS+= 	-I${.CURDIR}/../../contrib/isc-dhcp/includes \
-		-I${.CURDIR}/../../contrib/isc-dhcp
+MAN5=	dhclient.conf.5 dhclient.leases.5 dhcp-options.5
+MAN8=	dhclient.8 dhclient-script.8
 
-MAN5=		dhclient.conf.5 dhclient.leases.5 dhcp-options.5
-MAN8=		dhclient.8 dhclient-script.8
-
-afterinstall:
+beforeinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-		${DIST_DIR}/client/scripts/freebsd ${BINDIR}/dhclient-script
+	    ${DIST_DIR}/client/scripts/freebsd ${BINDIR}/dhclient-script
 
 .include <bsd.prog.mk>