diff -Nru blackbox-0.65.0/src/blackbox.cc blackbox-0.65.0.new/src/blackbox.cc --- blackbox-0.65.0/src/blackbox.cc Sun Aug 25 10:05:45 2002 +++ blackbox-0.65.0.new/src/blackbox.cc Sun Mar 23 17:51:49 2003 @@ -126,9 +126,14 @@ ::blackbox = this; argv = m_argv; - if (! rc) rc = "~/.blackboxrc"; - rc_file = expandTilde(rc); - + + char *etc_dir = getenv("ETC_DIR"); + if (etc_dir) { + rc_file = string(etc_dir) + string("/blackboxrc"); + } else { + if (! rc) rc = "~/.blackboxrc"; + rc_file = expandTilde(rc); + } no_focus = False; resource.auto_raise_delay.tv_sec = resource.auto_raise_delay.tv_usec = 0; diff -Nru blackbox-0.65.0/util/bsetbg blackbox-0.65.0.new/util/bsetbg --- blackbox-0.65.0/util/bsetbg Thu Aug 29 15:01:42 2002 +++ blackbox-0.65.0.new/util/bsetbg Sun Mar 23 17:23:34 2003 @@ -64,8 +64,15 @@ me=${0##*/} version=2.1 copyright="(c) 2000-$(date +%Y) by Timothy M. King (http://lordzork.com/)" -config=$HOME/.bsetbgrc -last_cmd_file=$HOME/.bsetbg_last_cmd + +if [ "x$ETC_DIR" != "x" ] +then + config=$ETC_DIR/bsetbgrc + last_cmd_file=$ETC_DIR/bsetbg_last_cmd +else + config=$HOME/.bsetbgrc + last_cmd_file=$HOME/.bsetbg_last_cmd +fi refresh_cmd=xrefresh p=$me: @@ -362,7 +369,7 @@ read_config=1 fi - . $HOME/.bsetbgrc 2>/dev/null + . $config 2>/dev/null check_no_exec full_cmd=$FULL