Use `foo/bar.a' instead of `-Lfoo -lbar' for linking to static internal

libraries so that `ld -f' in can create correct dependencies for
yet-to-be-built libraries.

Get the default BINDIR correctly (by including ../Makefile.inc recursively.

3 files changed, 14 insertions, 15 deletions

diff --git a/gnu/usr.bin/man/Makefile.inc b/gnu/usr.bin/man/Makefile.inc
index b8a3e55..7159325 100644
--- a/gnu/usr.bin/man/Makefile.inc
+++ b/gnu/usr.bin/man/Makefile.inc
@@ -2,7 +2,6 @@
 # Set a bunch of things to hardcoded paths so that we don't accidently
 # pick up a user's own version of some utility and hose ourselves.
 #
-BINDIR?=		/usr/bin
 libdir=			/etc
 bindir=			${BINDIR}
 pager=			more -s
@@ -21,3 +20,13 @@ pic=			/usr/bin/pic
 zcat=			/usr/bin/zcat
 compress=		/usr/bin/gzip -c
 compext=		.gz
+
+.if exists(${.OBJDIR}/../lib)
+LIBDESTDIR=		${.OBJDIR}/../lib
+.else
+LIBDESTDIR=		${.CURDIR}/../lib
+.endif
+
+LIBMAN=	${LIBDESTDIR}/libman.a
+
+.include "../Makefile.inc"
diff --git a/gnu/usr.bin/man/man/Makefile b/gnu/usr.bin/man/man/Makefile
index 86d6197..ee856fe 100644
--- a/gnu/usr.bin/man/man/Makefile
+++ b/gnu/usr.bin/man/man/Makefile
@@ -5,14 +5,9 @@ BINOWN= man
 BINMODE=4555
 INSTALLFLAGS+= -fschg
 
-.if exists(${.OBJDIR}/../lib)
-LIBDESTDIR=	${.OBJDIR}/../lib
-.else
-LIBDESTDIR=	${.CURDIR}/../lib
-.endif
 CFLAGS+= -I${LIBDESTDIR}
-DPADD=	${LIBDESTDIR}/libman.a
-LDADD=	-L${LIBDESTDIR} -lman
+DPADD=	${LIBMAN}
+LDADD=	${LIBMAN}
 
 CFLAGS+= -I${.CURDIR}/../lib -DSTDC_HEADERS -DPOSIX -DHAS_TROFF
 CFLAGS+= -DDO_COMPRESS -DALT_SYSTEMS -DSETREUID -DCATMODE=0644
diff --git a/gnu/usr.bin/man/manpath/Makefile b/gnu/usr.bin/man/manpath/Makefile
index d3fa6b6..e8d3bf6 100644
--- a/gnu/usr.bin/man/manpath/Makefile
+++ b/gnu/usr.bin/man/manpath/Makefile
@@ -2,13 +2,8 @@ PROG=	manpath
 SRCS=	manpath.c
 MAN1=	manpath.1
 
-.if exists(${.OBJDIR}/../lib)
-LIBDESTDIR=	${.OBJDIR}/../lib
-.else
-LIBDESTDIR=	${.CURDIR}/../lib
-.endif
-DPADD=	${LIBDESTDIR}/libman.a
-LDADD=	-L${LIBDESTDIR} -lman
+DPADD=	${LIBMAN}
+LDADD=	${LIBMAN}
 
 CFLAGS+= -DMAIN -DSTDC_HEADERS -DPOSIX -DHAS_TROFF -DDO_UNCOMPRESS
 CFLAGS+= -DALT_SYSTEMS -I${.CURDIR}/../lib -I${.OBJDIR}/../lib