From 30b8bfbace78a3e73cb4229f32d33abd01362dad Mon Sep 17 00:00:00 2001 From: christos Date: Sun, 21 Nov 2010 22:50:37 +0000 Subject: [PATCH] - don't bitch if /usr/X11R6/lib/X11 does not exist, if /usr/X11R6 does not exist either. We might have never installed X11R6 on this system. - spell nonexistent --- usr.sbin/postinstall/postinstall | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/usr.sbin/postinstall/postinstall b/usr.sbin/postinstall/postinstall index fd0c8b5f0ec0..818588f5f995 100755 --- a/usr.sbin/postinstall/postinstall +++ b/usr.sbin/postinstall/postinstall @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: postinstall,v 1.109 2010/11/08 09:01:44 njoly Exp $ +# $NetBSD: postinstall,v 1.110 2010/11/21 22:50:37 christos Exp $ # # Copyright (c) 2002-2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -633,7 +633,7 @@ detect_x11() MKX11=no X11ROOTDIR= fi - X11SRCDIR=/nonexisent/xsrc + X11SRCDIR=/nonexistent/xsrc fi } @@ -1305,10 +1305,13 @@ do_x11() msg "${_etcx11} is not a directory; skipping check" return 0 fi - _libx11="${DEST_DIR}/usr/X11R6/lib/X11" - if [ ! -d "${_libx11}" ]; then - msg "${_libx11} is not a directory; skipping check" - return 0 + if [ -d "${DEST_DIR}/usr/X11R6/." ] + then + _libx11="${DEST_DIR}/usr/X11R6/lib/X11" + if [ ! -d "${_libx11}" ]; then + msg "${_libx11} is not a directory; skipping check" + return 0 + fi fi _notfixed=""