summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2010-04-15 11:40:33 -0700
committerJeremy Huddleston <jeremyhu@apple.com>2010-04-16 12:56:02 -0700
commitc82295911409c611c097ef2e1269a78d54314304 (patch)
tree79bad80af0a1ee20f51dc6c39eb4827020767c56
parent7f9d31e6342ffe5f2903fb2f4e5d3a1e4e5ed1df (diff)
downloadxorg-app-xinit-c82295911409c611c097ef2e1269a78d54314304.tar.gz
Enable support for an xinitrc.d directory
This was already done on darwin and Gentoo. Now others can benefit. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Reviewed-by: RĂ©mi Cardona <remi@gentoo.org> Reviewed-by: James Cloos <cloos@jhcloos.com>
-rw-r--r--xinitrc.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/xinitrc.cpp b/xinitrc.cpp
index 379b1f3..049a8e4 100644
--- a/xinitrc.cpp
+++ b/xinitrc.cpp
@@ -84,8 +84,6 @@ fi
XCOMM This is the fallback case if nothing else is executed above
#endif /* !defined(__SCO__) && !defined(__UNIXWARE__) */
-#ifdef __APPLE__
-
if [ -d XINITDIR/xinitrc.d ] ; then
for f in XINITDIR/xinitrc.dXSLASHGLOB.sh ; do
[ -x "$f" ] && . "$f"
@@ -93,8 +91,6 @@ if [ -d XINITDIR/xinitrc.d ] ; then
unset f
fi
-#endif
-
TWM &
XCLOCK -geometry 50x50-1+1 &
XTERM -geometry 80x50+494+51 &