Module Name: src
Committed By: christos
Date: Sun Nov 21 22:50:38 UTC 2010
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
- 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
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/usr.sbin/postinstall/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.109 src/usr.sbin/postinstall/postinstall:1.110
--- src/usr.sbin/postinstall/postinstall:1.109 Mon Nov 8 04:01:44 2010
+++ src/usr.sbin/postinstall/postinstall Sun Nov 21 17:50:37 2010
@@ -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 @@
MKX11=no
X11ROOTDIR=
fi
- X11SRCDIR=/nonexisent/xsrc
+ X11SRCDIR=/nonexistent/xsrc
fi
}
@@ -1305,10 +1305,13 @@
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=""
