diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2013-03-10 21:07:24 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2013-03-10 21:07:24 +0000 |
| commit | fbb863b968bfb1eb0ee60ddfcc324a4eefe433c6 (patch) | |
| tree | 1177d4e78bbab9dfd761e69b27b98ac08abe360a /gnu/usr.bin | |
| parent | 9844099007c69e94206409075a8a43e9b7a70099 (diff) | |
Sync to ../binutils/Makefile.bsd-wrapper rev. 1.75:
eplace a comment asking for a particular order to build stuff in
by actual make rules to enforce that order.
While here, correct the MANDIR which must no more contain "cat".
Diffstat (limited to 'gnu/usr.bin')
| -rw-r--r-- | gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper b/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper index 2334e1fd3de..d6c37c50a1f 100644 --- a/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper +++ b/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.6 2013/03/10 21:06:23 miod Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.7 2013/03/10 21:07:23 miod Exp $ .include <bsd.own.mk> @@ -10,7 +10,7 @@ CFLAGS+= ${PIE_DEFAULT} # testing purposes PREFIX=/usr .if ${PREFIX} != "/usr" -MANDIR=${PREFIX}/share/man/cat +MANDIR=${PREFIX}/share/man/man .endif MAN= binutils/doc/addr2line.1 binutils/doc/objcopy.1 \ @@ -90,10 +90,12 @@ do-config: .USE mv -f Makefile.tmp Makefile cd ${.OBJDIR} && \ ${MAKE} ${CONFIGURE_MODULES} + .if ${ELF_TOOLCHAIN:L} == "yes" - # We need to generate as.1 and ld.1 immediately after config.status - # for the manpage machinery to work properly. +gas/doc/as.1: config.status cd ${.OBJDIR}/gas/doc && ${MAKE} as.1 + +ld/ld.1: config.status cd ${.OBJDIR}/ld && ${MAKE} ld.1 .endif |