5 files changed, 5 insertions, 5 deletions

diff --git a/util/fbrun/Makemodule.am b/util/fbrun/Makemodule.am
index cb98e92..f730ac8 100644
--- a/util/fbrun/Makemodule.am
+++ b/util/fbrun/Makemodule.am
@@ -2,7 +2,7 @@ bin_PROGRAMS += fbrun
 
 fbrun_CPPFLAGS = \
         $(AM_CPPFLAGS) \
-        -I$(fbtk_incdir)
+        -I$(src_incdir)
 
 fbrun_SOURCES = \
         util/fbrun/FbRun.hh \
diff --git a/util/fbrun/main.cc b/util/fbrun/main.cc
index 5b4156b..ba2d09d 100644
--- a/util/fbrun/main.cc
+++ b/util/fbrun/main.cc
@@ -48,7 +48,7 @@ using std::endl;
 using std::string;
 
 void showUsage(const char *progname) {
-    cerr<<"fbrun 1.5 : (c) 2002-2013 Henrik Kinnunen"<<endl;
+    cerr<<"fbrun 1.5 : (c) 2002-2014 Henrik Kinnunen"<<endl;
     cerr<<"Usage: "<<
         progname<<" [arguments]"<<endl<<
         "Arguments: "<<endl<<
diff --git a/util/fbsetroot.cc b/util/fbsetroot.cc
index 6dd478b..3a2f2b9 100644
--- a/util/fbsetroot.cc
+++ b/util/fbsetroot.cc
@@ -360,7 +360,7 @@ void fbsetroot::gradient() {
 */
 void fbsetroot::usage(int exit_code) {
     _FB_USES_NLS;
-    cout << m_app_name << " 2.3 : (c) 2003-2011 Fluxbox Development Team" << endl;
+    cout << m_app_name << " 2.3 : (c) 2003-2014 Fluxbox Development Team" << endl;
     cout << m_app_name << " 2.1 : (c) 2002 Claes Nasten" << endl;
     cout << m_app_name << " 2.0 : (c) 1997-2000 Brad Hughes\n" << endl;
     cout << _FB_CONSOLETEXT(fbsetroot, Usage,
diff --git a/util/fluxbox-remote.cc b/util/fluxbox-remote.cc
index 340ac5b..0fcd118 100644
--- a/util/fluxbox-remote.cc
+++ b/util/fluxbox-remote.cc
@@ -57,6 +57,7 @@ int main(int argc, char **argv) {
     disp = XOpenDisplay(NULL);
     if (!disp) {
         perror("error, can't open display.");
+        rc = EXIT_FAILURE;
         return rc;
     }
 
diff --git a/util/fluxbox-update_configs.cc b/util/fluxbox-update_configs.cc
index b93f344..164b073 100644
--- a/util/fluxbox-update_configs.cc
+++ b/util/fluxbox-update_configs.cc
@@ -55,7 +55,6 @@ using std::set;
 using std::map;
 using std::list;
 using std::exit;
-using std::getenv;
 
 string read_file(const string& filename);
 void write_file(const string& filename, const string &contents);
@@ -606,7 +605,7 @@ int main(int argc, char **argv) {
     }
 
     if (rc_filename.empty())
-        rc_filename = getenv("HOME") + string("/.fluxbox/init");
+        rc_filename = FbTk::StringUtil::expandFilename("~/.fluxbox/init");
 
     FbTk::ResourceManager resource_manager(rc_filename.c_str(),false);
     if (!resource_manager.load(rc_filename.c_str())) {