From a772acc31c532c77d31cda39d74c027ccdaeca83 Mon Sep 17 00:00:00 2001
From: jkh <jkh@FreeBSD.org>
Date: Sat, 1 Apr 1995 09:14:37 +0000
Subject: Greatly clean up the Makefiles and add a Makefile.inc to more
 obviously advertise tip's choice of location and perms.

---
 usr.bin/tip/Makefile.inc    |  5 +++++
 usr.bin/tip/libacu/Makefile |  4 ++--
 usr.bin/tip/tip/Makefile    | 26 +++++++++++++-------------
 3 files changed, 20 insertions(+), 15 deletions(-)
 create mode 100644 usr.bin/tip/Makefile.inc

(limited to 'usr.bin/tip')

diff --git a/usr.bin/tip/Makefile.inc b/usr.bin/tip/Makefile.inc
new file mode 100644
index 0000000..4a9bb26
--- /dev/null
+++ b/usr.bin/tip/Makefile.inc
@@ -0,0 +1,5 @@
+# These are mostly just for tip, but they're more visible up here.
+BINDIR?=	/usr/bin
+BINOWN?=	uucp
+BINGRP?=	dialer
+BINMODE?=	4510
diff --git a/usr.bin/tip/libacu/Makefile b/usr.bin/tip/libacu/Makefile
index 12a2e44..77a95cd 100644
--- a/usr.bin/tip/libacu/Makefile
+++ b/usr.bin/tip/libacu/Makefile
@@ -1,5 +1,5 @@
-LIB=acu
-CFLAGS+=	-g -I${.CURDIR}/../tip
+LIB=		acu
+CFLAGS+=	-I${.CURDIR}/../tip
 SRCS=		acucommon.c biz22.c courier.c df.c dn11.c hayes.c \
 		multitech.c t3000.c tod.c unidialer.c v3451.c v831.c ventel.c
 NOPROFILE=	yes
diff --git a/usr.bin/tip/tip/Makefile b/usr.bin/tip/tip/Makefile
index 39b89b0..e513746 100644
--- a/usr.bin/tip/tip/Makefile
+++ b/usr.bin/tip/tip/Makefile
@@ -7,18 +7,18 @@
 #	/var/log/aculog		ACU accounting file, owned by ${OWNER} and
 #				mode 6?? {if ACULOG defined}
 
-CFLAGS+=-g
-LIBACU=../libacu/libacu.a
-BINDIR=/usr/bin
-BINOWN=uucp
-BINGRP=dialer
-BINMODE=4510
-LDADD+=$(LIBACU)
-LINKS=${BINDIR}/tip
-MAN1=tip.1
-MAN5=modems.5
-SRCS=acu.c acutab.c cmds.c cmdtab.c cu.c hunt.c log.c partab.c \
+.if exists(${.CURDIR}/../libacu/obj)
+LIBACU=${.CURDIR}/../libacu/obj/libacu.a
+.else
+LIBACU=${.CURDIR}/../libacu/libacu.a
+.endif
+
+PROG=	tip
+LDADD+=	$(LIBACU)
+LINKS=	${BINDIR}/tip
+MAN1=	tip.1
+MAN5=	modems.5
+SRCS=	acu.c acutab.c cmds.c cmdtab.c cu.c hunt.c log.c partab.c \
 	remote.c tip.c tipout.c uucplock.c value.c vars.c 
-PROG=tip
-$(OBJS): tipconf.h
+
 .include <bsd.prog.mk>
-- 
cgit v1.1