diff options
| author | bde <bde@FreeBSD.org> | 1996-09-05 17:16:10 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1996-09-05 17:16:10 +0000 |
| commit | 11546f4616454e8fe6b6b85898bc2f22f9930985 (patch) | |
| tree | 235e8fcbe852dee096eebfd2c176b6d10c0afa2c /gnu | |
| parent | 38fd8fd26ef8cf2f925107c1267dd58f6e623be9 (diff) | |
| download | FreeBSD-src-11546f4616454e8fe6b6b85898bc2f22f9930985.zip FreeBSD-src-11546f4616454e8fe6b6b85898bc2f22f9930985.tar.gz | |
Fixed DPADD.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/lib/libg++/Makefile | 6 | ||||
| -rw-r--r-- | gnu/usr.bin/man/man/Makefile | 9 | ||||
| -rw-r--r-- | gnu/usr.bin/man/manpath/Makefile | 7 |
3 files changed, 12 insertions, 10 deletions
diff --git a/gnu/lib/libg++/Makefile b/gnu/lib/libg++/Makefile index 5b4ece6..6ec0942 100644 --- a/gnu/lib/libg++/Makefile +++ b/gnu/lib/libg++/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.11 1995/08/06 12:22:53 bde Exp $ +# $Id: Makefile,v 1.12 1996/08/30 02:09:09 peter Exp $ # SRCS= bitand.c bitany.c bitblt.c bitclear.c bitcopy.c bitcount.c \ bitinvert.c bitlcomp.c bitset1.c bitxor.c cleanup.c except.c \ @@ -29,8 +29,8 @@ NOMAN= noman CFLAGS+= -nostdinc -I${.CURDIR}/include -I/usr/include CXXFLAGS+= -I${.CURDIR}/include -I/usr/include/g++ -I/usr/include \ -nostdinc++ -LDADD+= -lcurses -lcompat -lgcc_pic -DPADD+= ${LIBCURSES} ${LIBCOMPAT} +DPADD= ${LIBCURSES} ${LIBCOMPAT} ${LIBGCC_PIC} +LDADD= -lcurses -lcompat -lgcc_pic .PATH: ${.CURDIR}/libiberty ${.CURDIR}/libio ${.CURDIR}/libg++ ${.CURDIR}/librx beforeinstall: diff --git a/gnu/usr.bin/man/man/Makefile b/gnu/usr.bin/man/man/Makefile index 7e7f225..9aff737 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 8e55b99..0eaccef 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} |
