summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--etc/rc4
-rw-r--r--gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper4
-rw-r--r--gnu/usr.bin/binutils/Makefile.bsd-wrapper4
-rw-r--r--gnu/usr.bin/cc/c++/Makefile4
-rw-r--r--gnu/usr.bin/cc/cc/Makefile4
-rw-r--r--lib/csu/Makefile4
-rw-r--r--share/mk/bsd.lib.mk10
-rw-r--r--share/mk/bsd.prog.mk6
-rw-r--r--sys/arch/alpha/stand/netboot/Makefile6
-rw-r--r--usr.bin/lorder/Makefile4
-rw-r--r--usr.bin/mandoc/Makefile4
-rw-r--r--usr.bin/xinstall/Makefile4
12 files changed, 29 insertions, 29 deletions
diff --git a/etc/rc b/etc/rc
index eab4aca0a8e..a3ce6e3c0ef 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.533 2019/02/19 20:41:52 kn Exp $
+# $OpenBSD: rc,v 1.534 2019/02/24 12:57:14 kn Exp $
# System startup script run by init on autoboot or after single-user.
# Output and error are redirected to console by init, and the console is the
@@ -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..dd07c6c1bab 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.16 2018/09/14 13:37:52 naddy Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.17 2019/02/24 12:57:13 kn Exp $
.include <bsd.own.mk>
@@ -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..e0ce21c2c68 100644
--- a/gnu/usr.bin/binutils/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/binutils/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.87 2018/09/14 13:37:52 naddy Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.88 2019/02/24 12:57:13 kn Exp $
.include <bsd.own.mk>
@@ -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..fff2132325b 100644
--- a/gnu/usr.bin/cc/c++/Makefile
+++ b/gnu/usr.bin/cc/c++/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD: src/gnu/usr.bin/cc/c++/Makefile,v 1.24.8.1 2009/04/15 03:14:26 kensmith Exp $
-# $OpenBSD: Makefile,v 1.2 2017/07/24 19:22:49 robert Exp $
+# $OpenBSD: Makefile,v 1.3 2019/02/24 12:57:13 kn Exp $
.include <bsd.own.mk>
@@ -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..f593df95741 100644
--- a/gnu/usr.bin/cc/cc/Makefile
+++ b/gnu/usr.bin/cc/cc/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD: src/gnu/usr.bin/cc/cc/Makefile,v 1.33.8.1 2009/04/15 03:14:26 kensmith Exp $
-# $OpenBSD: Makefile,v 1.8 2017/07/24 19:22:49 robert Exp $
+# $OpenBSD: Makefile,v 1.9 2019/02/24 12:57:13 kn Exp $
.include <bsd.own.mk>
@@ -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..a1c31e98b69 100644
--- a/lib/csu/Makefile
+++ b/lib/csu/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2017/08/12 00:05:16 guenther Exp $
+# $OpenBSD: Makefile,v 1.29 2019/02/24 12:57:14 kn Exp $
OBJS= crt0.o gcrt0.o
OBJS+= crtbegin.o crtend.o
@@ -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..998332d9e42 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.lib.mk,v 1.97 2019/02/20 08:51:09 robert Exp $
+# $OpenBSD: bsd.lib.mk,v 1.98 2019/02/24 12:57:14 kn Exp $
# $NetBSD: bsd.lib.mk,v 1.67 1996/01/17 20:39:26 mycroft Exp $
# @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91
@@ -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..cbf9b3a0ad2 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.prog.mk,v 1.76 2019/02/07 07:01:04 jsg Exp $
+# $OpenBSD: bsd.prog.mk,v 1.77 2019/02/24 12:57:14 kn Exp $
# $NetBSD: bsd.prog.mk,v 1.55 1996/04/08 21:19:26 jtc Exp $
# @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
@@ -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..a178b9b465e 100644
--- a/sys/arch/alpha/stand/netboot/Makefile
+++ b/sys/arch/alpha/stand/netboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2017/06/12 18:49:34 espie Exp $
+# $OpenBSD: Makefile,v 1.16 2019/02/24 12:57:14 kn Exp $
# $NetBSD: Makefile,v 1.11 1997/04/17 07:27:50 thorpej Exp $
S= ${.CURDIR}/../../../..
@@ -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..26ffd2e9563 100644
--- a/usr.bin/lorder/Makefile
+++ b/usr.bin/lorder/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.9 2011/11/08 10:37:10 guenther Exp $
+# $OpenBSD: Makefile,v 1.10 2019/02/24 12:57:14 kn Exp $
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..d470321b438 100644
--- a/usr.bin/mandoc/Makefile
+++ b/usr.bin/mandoc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.114 2018/12/24 19:59:17 schwarze Exp $
+# $OpenBSD: Makefile,v 1.115 2019/02/24 12:57:14 kn Exp $
.include <bsd.own.mk>
@@ -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..3494dab1709 100644
--- a/usr.bin/xinstall/Makefile
+++ b/usr.bin/xinstall/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2017/07/09 21:23:19 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2019/02/24 12:57:14 kn Exp $
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 01:40:48 +0000