now that install -S is always enabled, no need to specify it in mk
files.
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
--
Lauri Tirkkonen | lotheac @ IRCnet