X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=lib%2Fapp%2Fsetup.cpp;h=ca667bbc2a7b862f228b629ef034a9904f97e1f1;hb=7a7f7d03fdcb735bda2e5c9083bfd742e7695717;hp=5ddcb01984866ab873e08561b870390fce579f62;hpb=c03f452931adede1ad3f654a8329bbb58f5e4c61;p=supertux.git

diff --git a/lib/app/setup.cpp b/lib/app/setup.cpp
index 5ddcb0198..ca667bbc2 100644
--- a/lib/app/setup.cpp
+++ b/lib/app/setup.cpp
@@ -297,16 +297,21 @@ void Setup::directories(void)
         }
       else
         {
-          std::string exedir = std::string(dirname(exe_file)) + "/";
-          
-          datadir = exedir + "../../data"; // SuperTux run from source dir
+	  std::string exedir = std::string(dirname(exe_file)) + "/";
+	  
+          datadir = exedir + "../data"; // SuperTux run from source dir
           if (access(datadir.c_str(), F_OK) != 0)
             {
+	      datadir = exedir + "../../data";  //SuperTux run from source dir (with libtool script)
+	      
+	      if (access(datadir.c_str(), F_OK) != 0)
+	      {
               datadir = exedir + "../share/" + package_symbol_name; // SuperTux run from PATH
               if (access(datadir.c_str(), F_OK) != 0) 
                 { // If all fails, fall back to compiled path
                   datadir = DATA_PREFIX; 
                 }
+	      }
             }
         }
 #else
@@ -740,7 +745,7 @@ void Setup::parseargs(int argc, char * argv[])
       else if (strcmp(argv[i], "--version") == 0)
         {
           /* Show version: */
-          printf((package_name + package_version + "\n").c_str() );
+          printf((package_name + " " + package_version + "\n").c_str() );
           exit(0);
         }
       else if (strcmp(argv[i], "--disable-sound") == 0)