From 5257abea22a155de72aed390e0fde20ed7327dae Mon Sep 17 00:00:00 2001 From: Gordon Tetlow Date: Sun, 16 Nov 2003 21:17:43 +0000 Subject: [PATCH] Invert the condition that installs the dynamic linker early, since DYNAMICROOT is now the default. Also document -DNO_DYNAMICROOT since that is going to be a documented feature. Submitted by: matusita, rushani --- Makefile.inc1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index c51fa4096587..3e7903595b7a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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} == "/") && \