Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.sbin/postinstall - don't bitch if /usr/X11R6/lib/X11 doe...
details: https://anonhg.NetBSD.org/src/rev/057281bb0c4c
branches: trunk
changeset: 758941:057281bb0c4c
user: christos <christos%NetBSD.org@localhost>
date: Sun Nov 21 22:50:37 2010 +0000
description:
- 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
diffstat:
usr.sbin/postinstall/postinstall | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diffs (38 lines):
diff -r 486b1ce412f6 -r 057281bb0c4c usr.sbin/postinstall/postinstall
--- a/usr.sbin/postinstall/postinstall Sun Nov 21 22:17:24 2010 +0000
+++ b/usr.sbin/postinstall/postinstall Sun Nov 21 22:50:37 2010 +0000
@@ -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=""
Home |
Main Index |
Thread Index |
Old Index