Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- don't bitch if /usr/X11R6/lib/X11 does not exist, if /usr/X11R6 does not

Browse Source 
exist either. We might have never installed X11R6 on this system.
- spell nonexistent
This commit is contained in:
christos 2010-11-21 22:50:37 +00:00
parent a742ba8060
commit 30b8bfbace
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
usr.sbin/postinstall/postinstall
View File

@ -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=""