Changed Makefile to use Nate's selective obj/noobj build scheme.

diff --git a/gnu/usr.bin/man/man/Makefile b/gnu/usr.bin/man/man/Makefile
index d116ad9..31308bf 100644 (file)
--- a/gnu/usr.bin/man/man/Makefile
+++ b/gnu/usr.bin/man/man/Makefile
@@ -1,7 +1,12 @@
 PROG=  man
 SRCS=  man.c manpath.c glob.c
 MAN1=  man.1
 PROG=  man
 SRCS=  man.c manpath.c glob.c
 MAN1=  man.1

-LDADD+=        -L${.CURDIR}/../lib -lman
+
+.if exists(${.CURDIR}/../lib/obj)
+LDADD=  -L${.CURDIR}/../lib/obj -lman
+.else
+LDADD=  -L${.CURDIR}/../lib/ -lman
+.endif

 
 CFLAGS+= -I${.CURDIR}/../lib -DSTDC_HEADERS -DPOSIX -DHAS_TROFF -DDO_UNCOMPRESS -DALT_SYSTEMS
 
 
 CFLAGS+= -I${.CURDIR}/../lib -DSTDC_HEADERS -DPOSIX -DHAS_TROFF -DDO_UNCOMPRESS -DALT_SYSTEMS
 

diff --git a/gnu/usr.bin/man/manpath/Makefile b/gnu/usr.bin/man/manpath/Makefile
index 81897ab..76fdf9b 100644 (file)
--- a/gnu/usr.bin/man/manpath/Makefile
+++ b/gnu/usr.bin/man/manpath/Makefile
@@ -1,7 +1,12 @@
 PROG=  manpath
 MAN1=  manpath.1
 SRCS=  manpath.c
 PROG=  manpath
 MAN1=  manpath.1
 SRCS=  manpath.c

-LDADD+=        -L${.CURDIR}/../lib -lman
+
+.if exists(${.CURDIR}/../lib/obj)
+LDADD=  -L${.CURDIR}/../lib/obj -lman
+.else
+LDADD=  -L${.CURDIR}/../lib/ -lman
+.endif

 
 CFLAGS+= -I${.CURDIR}/../lib -DMAIN -DSTDC_HEADERS -DPOSIX -DHAS_TROFF -DDO_UNCOMPRESS -DALT_SYSTEMS
 
 
 CFLAGS+= -I${.CURDIR}/../lib -DMAIN -DSTDC_HEADERS -DPOSIX -DHAS_TROFF -DDO_UNCOMPRESS -DALT_SYSTEMS