d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Invert the condition that installs the dynamic linker early, since

Browse Source 
DYNAMICROOT is now the default. Also document -DNO_DYNAMICROOT since
that is going to be a documented feature.

Submitted by:	matusita, rushani
This commit is contained in:
gordon 2003-11-16 21:17:43 +00:00
parent ef5988e731
commit 09060c94bc
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.inc1
View File

@ -2,6 +2,7 @@
# $FreeBSD$
#
# Make command line options:
# -DNO_DYNAMICROOT do not link /bin and /sbin dynamically
# -DNO_KERBEROS Do not build Heimdal (Kerberos 5)
# -DNO_RESCUE do not build rescue binaries
# -DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@ -52,7 +53,7 @@ SUBDIR+= lib
# When upgrading to a dynamically linked root, install the runtime
# linker early into its new location before make(1) has a chance
# to run the dynamically linked /bin/sh.
.if defined(WITH_DYNAMICROOT) && !defined(NOPIC) && \
.if !defined(NO_DYNAMICROOT) && !defined(NOPIC) && \
(!defined(TARGET_ARCH) || ${TARGET_ARCH} == ${MACHINE_ARCH}) && \
!defined(DISTDIR) && \
(!defined(DESTDIR) || empty(DESTDIR) || ${DESTDIR} == "/") && \