summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorwollman <wollman@FreeBSD.org>1994-08-10 02:48:08 +0000
committerwollman <wollman@FreeBSD.org>1994-08-10 02:48:08 +0000
commit7d898724d7862f5e998ee06411d019a4918bc442 (patch)
treecbe47f97313fd7c7364414c314b675465d0321b6 /share
parent1a485fa2648e0edeec0624287bbee06dc3bf3bbd (diff)
downloadFreeBSD-src-7d898724d7862f5e998ee06411d019a4918bc442.zip
FreeBSD-src-7d898724d7862f5e998ee06411d019a4918bc442.tar.gz
Make the install targets obey the INSTALLFLAGS requests in the new
Makefiles. DANGER WILL ROBINSON! This will cause repeat installs of certain programs, such as `init' and `rcp', to fail unless one of the two conditions is met: 1) You are in single-user mode. 2) Your security level is set to 0 or -1. If you have compiled a kernel from the latest sources, your kernel security level is set to -1 by default, which will keep `init' from fiddling with it. You can increase it, but not decrease it, from the command line with the command `sysctl -w kern.securelevel=<new value>'. I believe that -1 is the most appropriate value to use while we are still developing the code, although when we ship it should be changed back to 0. See init(8) for more information.
Diffstat (limited to 'share')
-rw-r--r--share/mk/bsd.lib.mk13
-rw-r--r--share/mk/bsd.prog.mk4
2 files changed, 9 insertions, 8 deletions
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index fde3fd6..06f3325 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -1,5 +1,5 @@
# from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91
-# $Id: bsd.lib.mk,v 1.2 1994/08/04 21:09:23 wollman Exp $
+# $Id: bsd.lib.mk,v 1.3 1994/08/08 15:45:55 wollman Exp $
#
.if exists(${.CURDIR}/../Makefile.inc)
@@ -206,22 +206,23 @@ beforeinstall:
.endif
realinstall: beforeinstall
- ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} lib${LIB}.a \
- ${DESTDIR}${LIBDIR}
+ ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}.a
.if !defined(NOPROFILE)
${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- lib${LIB}_p.a ${DESTDIR}${LIBDIR}
+ ${INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR}
${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}_p.a
.endif
.if !defined(NOPIC)
.if defined(SHLIB_MAJOR) && defined(SHLIB_MINOR)
${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${DESTDIR}${LIBDIR}
+ ${INSTALLFLAGS} lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
+ ${DESTDIR}${LIBDIR}
.endif
.if defined(INSTALL_PIC_ARCHIVE)
${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- lib${LIB}_pic.a ${DESTDIR}${LIBDIR}
+ ${INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${LIBDIR}
${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a
.endif
.endif
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 8a24d4d..84246df 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,5 +1,5 @@
# from: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
-# $Id: bsd.prog.mk,v 1.28 1994/06/15 10:14:41 ache Exp $
+# $Id: bsd.prog.mk,v 1.2 1994/08/04 21:09:25 wollman Exp $
.if exists(${.CURDIR}/../Makefile.inc)
.include "${.CURDIR}/../Makefile.inc"
@@ -168,7 +168,7 @@ afterinstall:
realinstall: _PROGSUBDIR
.if defined(PROG)
${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- ${PROG} ${DESTDIR}${BINDIR}
+ ${INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}
.endif
.if defined(HIDEGAME)
(cd ${DESTDIR}/usr/games; rm -f ${PROG}; ln -s dm ${PROG}; \
OpenPOWER on IntegriCloud