On Thu, Feb 21 2019 13:47:55 +0100, Klemens Nanni wrote:
> There's more:
>
> $ find /usr/src -type f -name Makefile -exec grep -F -- -S {} + | grep -Fi
> install
> /usr/src/gnu/usr.bin/cc/c++/Makefile: ${INSTALL} ${INSTALL_COPY} -S
> ${INSTALL_STRIP} \
> /usr/src/gnu/usr.bin/cc/cc/Makefile: ${INSTALL} ${INSTALL_COPY} -S
> ${INSTALL_STRIP} \
> /usr/src/lib/csu/Makefile: ${INSTALL} ${INSTALL_COPY} -S -o ${BINOWN} -g
> ${BINGRP} -m 444 ${OBJS} \
> /usr/src/sys/arch/alpha/stand/netboot/Makefile: ${INSTALL} ${INSTALL_COPY} -S
> ${INSTALL_STRIP} \
> /usr/src/sys/arch/alpha/stand/netboot/Makefile: ${INSTALL} ${INSTALL_COPY} -S
> ${INSTALL_STRIP} \
> /usr/src/usr.bin/lorder/Makefile: ${INSTALL} ${INSTALL_COPY} -S -o
> ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
> /usr/src/usr.bin/mandoc/Makefile: ${INSTALL} ${INSTALL_COPY} -S
> ${INSTALL_STRIP} \
> /usr/src/usr.bin/xinstall/Makefile: ${INSTALL} ${INSTALL_COPY} -S
> ${INSTALL_STRIP} \
>
> And one in rc(8)'s reorder_libs().
Thanks. Also in gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper
gnu/usr.bin/binutils/Makefile.bsd-wrapper.
Updated diff to remove -S from all files mentioned above.
diff --git a/etc/rc b/etc/rc
index eab4aca0a8e..ef291042f33 100644
--- a/etc/rc
+++ b/etc/rc
@@ -202,7 +202,7 @@ reorder_libs() {
_tmpdir=$(mktemp -dq $_relink/_rebuild.XXXXXXXXXXXX) &&
(
set -o errexit
- _install='install -F -S -o root -g bin -m 0444'
+ _install='install -F -o root -g bin -m 0444'
_lib=${_liba##*/}
_lib=${_lib%.a}
_lib_dir=${_liba#$_relink}
diff --git a/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper
b/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper
index ed069d78d29..60a1f0f9706 100644
--- a/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper
@@ -122,7 +122,7 @@ install: maninstall
tooldir=${PREFIX} \
BSDSRCDIR=${BSDSRCDIR} \
INSTALL_MODULES='${INSTALL_MODULES}' \
- INSTALL_PROGRAM='${INSTALL} -c -S ${INSTALL_STRIP} -o ${BINOWN} -g
${BINGRP} -m ${BINMODE}' \
+ 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}' \
install install-info
diff --git a/gnu/usr.bin/binutils/Makefile.bsd-wrapper
b/gnu/usr.bin/binutils/Makefile.bsd-wrapper
index d29a4b815b1..f5e0edb5bcf 100644
--- a/gnu/usr.bin/binutils/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/binutils/Makefile.bsd-wrapper
@@ -83,7 +83,7 @@ install: maninstall
tooldir=${PREFIX} \
BSDSRCDIR=${BSDSRCDIR} \
INSTALL_MODULES='${INSTALL_MODULES}' \
- INSTALL_PROGRAM='${INSTALL} -c -S ${INSTALL_STRIP} -o ${BINOWN} -g
${BINGRP} -m ${BINMODE}' \
+ 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}' \
install install-info
diff --git a/gnu/usr.bin/cc/c++/Makefile b/gnu/usr.bin/cc/c++/Makefile
index b5a33bafa58..10a5c5a86fd 100644
--- a/gnu/usr.bin/cc/c++/Makefile
+++ b/gnu/usr.bin/cc/c++/Makefile
@@ -21,7 +21,7 @@ DPADD= ${LIBCPP} ${LIBIBERTY}
LDADD= ${LIBCPP} ${LIBIBERTY}
realinstall:
- ${INSTALL} ${INSTALL_COPY} -S ${INSTALL_STRIP} \
+ ${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} \
-o ${BINOWN} -g ${BINGRP} \
-m ${BINMODE} ${PROG} ${DESTDIR}${BINDIR}/${PROG:S/c/g/g}
diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile
index a4f8590c347..2d85054c5fc 100644
--- a/gnu/usr.bin/cc/cc/Makefile
+++ b/gnu/usr.bin/cc/cc/Makefile
@@ -22,7 +22,7 @@ beforeinstall:
.endfor
realinstall:
- ${INSTALL} ${INSTALL_COPY} -S ${INSTALL_STRIP} \
+ ${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} \
-o ${BINOWN} -g ${BINGRP} \
-m ${BINMODE} ${PROG} ${DESTDIR}${BINDIR}/g${PROG}
diff --git a/lib/csu/Makefile b/lib/csu/Makefile
index 7a65a73da64..4d57de5ed94 100644
--- a/lib/csu/Makefile
+++ b/lib/csu/Makefile
@@ -88,7 +88,7 @@ crtendS.o: crtendS.c
@rm -f ${.TARGET}.o
realinstall:
- ${INSTALL} ${INSTALL_COPY} -S -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
${DESTDIR}/usr/lib
.include <bsd.prog.mk>
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index a7689506a58..baca99ae45b 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -274,7 +274,7 @@ beforeinstall:
realinstall:
# ranlib lib${LIB}.a
- ${INSTALL} ${INSTALL_COPY} -S -o ${LIBOWN} -g ${LIBGRP} -m 600
lib${LIB}.a \
+ ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m 600 lib${LIB}.a
\
${DESTDIR}${LIBDIR}/lib${LIB}.a
.if (${INSTALL_COPY} != "-p")
${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}.a
@@ -282,7 +282,7 @@ realinstall:
chmod ${LIBMODE} ${DESTDIR}${LIBDIR}/lib${LIB}.a
.if !defined(NOPROFILE)
# ranlib lib${LIB}_p.a
- ${INSTALL} ${INSTALL_COPY} -S -o ${LIBOWN} -g ${LIBGRP} -m 600 \
+ ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m 600 \
lib${LIB}_p.a ${DESTDIR}${LIBDIR}
.if (${INSTALL_COPY} != "-p")
${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}_p.a
@@ -290,7 +290,7 @@ realinstall:
chmod ${LIBMODE} ${DESTDIR}${LIBDIR}/lib${LIB}_p.a
.endif
.if !defined(NOPIC) && defined(SHLIB_MAJOR) && defined(SHLIB_MINOR)
- ${INSTALL} ${INSTALL_COPY} -S -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${FULLSHLIBNAME} ${DESTDIR}${LIBDIR}
.if defined(LIBREBUILD)
.if !defined(DESTDIR)
@@ -299,7 +299,7 @@ realinstall:
.endif
${INSTALL} -d -o ${LIBOWN} -g ${LIBGRP} -m 755 \
${DESTDIR}/usr/share/relink/${LIBDIR}
- ${INSTALL} ${INSTALL_COPY} -S -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${FULLSHLIBNAME}.a ${DESTDIR}/usr/share/relink/${LIBDIR}
.endif
.endif
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 87bc4a72c05..13361ea3777 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -148,13 +148,13 @@ afterinstall:
.if !target(realinstall)
realinstall:
. if defined(PROG)
- ${INSTALL} ${INSTALL_COPY} -S ${INSTALL_STRIP} \
+ ${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} \
-o ${BINOWN} -g ${BINGRP} \
-m ${BINMODE} ${PROG} ${DESTDIR}${BINDIR}/${PROG}
. endif
. if defined(PROGS)
. for p in ${PROGS}
- ${INSTALL} ${INSTALL_COPY} -S ${INSTALL_STRIP} \
+ ${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} \
-o ${BINOWN} -g ${BINGRP} \
-m ${BINMODE} $p ${DESTDIR}${BINDIR}/$p
. endfor
diff --git a/sys/arch/alpha/stand/netboot/Makefile
b/sys/arch/alpha/stand/netboot/Makefile
index e871ef819da..4f88c7ddda5 100644
--- a/sys/arch/alpha/stand/netboot/Makefile
+++ b/sys/arch/alpha/stand/netboot/Makefile
@@ -41,10 +41,10 @@ ${PROG} ${PROG}.mop: ${PROG}.nosym
mopa.out ${PROG}.nosym ${PROG}.mop
realinstall:
- ${INSTALL} ${INSTALL_COPY} -S ${INSTALL_STRIP} \
+ ${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} \
-o ${BINOWN} -g ${BINGRP} \
-m ${BINMODE} ${PROG} ${DESTDIR}${BINDIR}/${PROG}
- ${INSTALL} ${INSTALL_COPY} -S ${INSTALL_STRIP} \
+ ${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} \
-o ${BINOWN} -g ${BINGRP} \
-m ${BINMODE} ${PROG}.mop ${DESTDIR}${BINDIR}/${PROG}.mop
diff --git a/usr.bin/lorder/Makefile b/usr.bin/lorder/Makefile
index 21755a9db30..51b524557cd 100644
--- a/usr.bin/lorder/Makefile
+++ b/usr.bin/lorder/Makefile
@@ -5,7 +5,7 @@ MAN= lorder.1
SCRIPT= lorder.sh
realinstall:
- ${INSTALL} ${INSTALL_COPY} -S -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${.CURDIR}/${SCRIPT} ${DESTDIR}${BINDIR}/lorder
.include <bsd.prog.mk>
diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile
index eb665fd863d..389fa011228 100644
--- a/usr.bin/mandoc/Makefile
+++ b/usr.bin/mandoc/Makefile
@@ -69,7 +69,7 @@ man.cgi: ${CGI_OBJS}
installcgi: man.cgi
${INSTALL} -d -o root -g wheel -m 755 ${DESTDIR}/var/www/cgi-bin
- ${INSTALL} ${INSTALL_COPY} -S ${INSTALL_STRIP} \
+ ${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} \
-o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
man.cgi ${DESTDIR}/var/www/cgi-bin/man.cgi
${INSTALL} ${INSTALL_COPY} -o root -g wheel -m 644 \
diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile
index 865cfbb6ddc..71eb74a9294 100644
--- a/usr.bin/xinstall/Makefile
+++ b/usr.bin/xinstall/Makefile
@@ -4,7 +4,7 @@ PROG= xinstall
MAN= install.1
realinstall:
- ${INSTALL} ${INSTALL_COPY} -S ${INSTALL_STRIP} \
+ ${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} \
-o ${BINOWN} -g ${BINGRP} \
-m ${BINMODE} ${PROG} ${DESTDIR}${BINDIR}/install
--
Lauri Tirkkonen | lotheac @ IRCnet
