diff options
Diffstat (limited to 'gnu/usr.bin')
| -rw-r--r-- | gnu/usr.bin/man/man/Makefile | 9 | ||||
| -rw-r--r-- | gnu/usr.bin/man/manpath/Makefile | 7 |
2 files changed, 9 insertions, 7 deletions
diff --git a/gnu/usr.bin/man/man/Makefile b/gnu/usr.bin/man/man/Makefile index 7e7f22562f90..9aff7372dc77 100644 --- a/gnu/usr.bin/man/man/Makefile +++ b/gnu/usr.bin/man/man/Makefile @@ -4,11 +4,13 @@ BINOWN= man BINMODE=4555 .if exists(${.OBJDIR}/../lib) -LDADD= -L${.OBJDIR}/../lib -lman -CFLAGS+= -I${.OBJDIR}/../lib +LIBDESTDIR= ${.OBJDIR}/../lib .else -LDADD= -L${.CURDIR}/../lib/ -lman +LIBDESTDIR= ${.CURDIR}/../lib .endif +CFLAGS+= -I${LIBDESTDIR} +DPADD= ${LIBDESTDIR}/libman.a +LDADD= -L${LIBDESTDIR} -lman .if exists(${.OBJDIR}) MAN1= ${.OBJDIR}/man.1 @@ -16,7 +18,6 @@ MAN1= ${.OBJDIR}/man.1 MAN1= ${.CURDIR}/man.1 .endif -DPADD+= ${MAN1} CFLAGS+= -I${.CURDIR}/../lib -DSTDC_HEADERS -DPOSIX -DHAS_TROFF CFLAGS+= -DDO_COMPRESS -DALT_SYSTEMS -DSETREUID -DCATMODE=0664 CLEANFILES+= ${MAN1} diff --git a/gnu/usr.bin/man/manpath/Makefile b/gnu/usr.bin/man/manpath/Makefile index 8e55b99a4364..0eaccef4e79e 100644 --- a/gnu/usr.bin/man/manpath/Makefile +++ b/gnu/usr.bin/man/manpath/Makefile @@ -2,10 +2,12 @@ PROG= manpath SRCS= manpath.c .if exists(${.OBJDIR}/../lib) -LDADD= -L${.OBJDIR}/../lib -lman +LIBDESTDIR= ${.OBJDIR}/../lib .else -LDADD= -L${.CURDIR}/../lib/ -lman +LIBDESTDIR= ${.CURDIR}/../lib .endif +DPADD= ${LIBDESTDIR}/libman.a +LDADD= -L${LIBDESTDIR} -lman .if exists(${.OBJDIR}) MAN1=${.OBJDIR}/manpath.1 @@ -13,7 +15,6 @@ MAN1=${.OBJDIR}/manpath.1 MAN1=${.CURDIR}/manpath.1 .endif -DPADD+= ${MAN1} CFLAGS+= -DMAIN -DSTDC_HEADERS -DPOSIX -DHAS_TROFF -DDO_UNCOMPRESS CFLAGS+= -DALT_SYSTEMS -I${.CURDIR}/../lib -I${.OBJDIR}/../lib CLEANFILES+= ${MAN1} |