Index: src/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper diff -u src/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper:1.30 src/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper:1.31 --- src/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper:1.30 Thu Jan 19 17:54:45 2023 +++ src/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper Fri Jan 27 17:01:02 2023 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.30 2023/01/19 22:54:45 kettenis Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.31 2023/01/27 22:01:02 kettenis Exp $ .include @@ -29,7 +29,7 @@ SUBDIRS+= binutils CONF_SUBDIRS+= binutils INST_SUBDIRS+= binutils -MAN+= binutils/doc/strings.1 binutils/doc/strip.1 +MAN+= binutils/doc/strings.1 .if (${TARGET_ARCH} != "aarch64" && ${TARGET_ARCH} != "powerpc64" && \ ${TARGET_ARCH} != "riscv64") @@ -47,8 +47,12 @@ .endif .if ${LINKER_VERSION:L} == "bfd" +MAN+= binutils/doc/strip.1 maninstall: cd ${DESTDIR}${MANDIR}1 && rm -f ld.1 && ln ld.bfd.1 ld.1 +.else +# skip installing strip(1) which is am__EXEEXT_14 +SKIP_STRIP= am__EXEEXT_14= .endif # Used by the GNU Makefile @@ -139,7 +143,7 @@ INSTALL_PROGRAM='${INSTALL} -c ${INSTALL_STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}' \ INSTALL_DATA='${INSTALL} -c -o ${DOCOWN} -g ${DOCGRP} -m ${NONBINMODE}' \ INSTALL_INFO_HOST_MODULES='${INSTALL_INFO_HOST_MODULES}' \ - ${SKIP_AR} \ + ${SKIP_AR} ${SKIP_STRIP} \ $t .endfor .if ${LINKER_VERSION:L} == "bfd"