From 5bb4465215f6929b51cd50bcda36062236966be4 Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Tue, 19 Jan 1999 00:23:25 +0000
Subject: Fixed breakage of `make checkdpadd' in previous commit.

Didn't fix related bogotification from moving the definitions of
DPADD and LDADD to here.  Setting these variables in a top-level
directory gives bogus dependencies in library subdirectories.
E.g., there is a dependency on `foo.so..' where the double dots
separate null shared library version numbers.

Set BINDIR properly by inheriting it from ../Makefile.inc.
---
 usr.bin/global/Makefile.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr.bin/global/Makefile.inc b/usr.bin/global/Makefile.inc
index 73b1c59..34657a0 100644
--- a/usr.bin/global/Makefile.inc
+++ b/usr.bin/global/Makefile.inc
@@ -1,18 +1,18 @@
-# $Id: Makefile.inc,v 1.4 1997/12/17 15:18:48 cwt Exp $
+# $Id: Makefile.inc,v 1.5 1999/01/18 07:38:09 simokawa Exp $
 
 .if !defined(GLOBAL_MAKEFILE_INC_BEEN_HERE)
 
 GLOBAL_MAKEFILE_INC_BEEN_HERE=yes
-BINDIR?=	/usr/bin
 .if exists(${.OBJDIR}/../lib)
 LIBDESTDIR=	${.OBJDIR}/../lib
 .else
 LIBDESTDIR=	${.CURDIR}/../lib
 .endif
-LDDESTDIR=	-L${LIBDESTDIR}
-LDADD=		-lgloutil
 DPADD=		${LIBDESTDIR}/libgloutil.a
+LDADD=		${LIBDESTDIR}/libgloutil.a
 CFLAGS+=	-I${GLOBAL_DIR}/lib -O \
 		-Wall -Wwrite-strings -Wmissing-prototypes
 
+.include "../Makefile.inc"
+
 .endif
-- 
cgit v1.1