42 lines
2.1 KiB
Diff
42 lines
2.1 KiB
Diff
diff -up ./SConstruct.orig ./SConstruct
|
|
--- ./SConstruct.orig 2016-01-11 20:28:45.250276511 -0800
|
|
+++ ./SConstruct 2016-01-11 20:29:13.778912624 -0800
|
|
@@ -43,7 +43,7 @@ sky = env.Program("endless-sky", Glob("b
|
|
|
|
|
|
# Install the binary:
|
|
-env.Install("$DESTDIR$PREFIX/games", sky)
|
|
+env.Install("$DESTDIR$PREFIX/bin", sky)
|
|
|
|
# Install the desktop file:
|
|
env.Install("$DESTDIR$PREFIX/share/applications", "endless-sky.desktop")
|
|
@@ -81,11 +81,11 @@ def RecursiveInstall(env, target, source
|
|
RecursiveInstall(env, os.path.join(target, name), node.abspath)
|
|
else:
|
|
env.Install(target, node)
|
|
-RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/data", "data")
|
|
-RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/images", "images")
|
|
-RecursiveInstall(env, "$DESTDIR$PREFIX/share/games/endless-sky/sounds", "sounds")
|
|
-env.Install("$DESTDIR$PREFIX/share/games/endless-sky", "credits.txt")
|
|
-env.Install("$DESTDIR$PREFIX/share/games/endless-sky", "keys.txt")
|
|
+RecursiveInstall(env, "$DESTDIR$PREFIX/share/endless-sky/data", "data")
|
|
+RecursiveInstall(env, "$DESTDIR$PREFIX/share/endless-sky/images", "images")
|
|
+RecursiveInstall(env, "$DESTDIR$PREFIX/share/endless-sky/sounds", "sounds")
|
|
+env.Install("$DESTDIR$PREFIX/share/endless-sky", "credits.txt")
|
|
+env.Install("$DESTDIR$PREFIX/share/endless-sky", "keys.txt")
|
|
|
|
# Make the word "install" in the command line do an installation.
|
|
env.Alias("install", "$DESTDIR$PREFIX")
|
|
diff -up ./source/Files.cpp.orig ./source/Files.cpp
|
|
--- ./source/Files.cpp.orig 2016-01-11 20:29:22.100806482 -0800
|
|
+++ ./source/Files.cpp 2016-01-11 20:29:35.419636593 -0800
|
|
@@ -115,7 +115,7 @@ void Files::Init(const char * const *arg
|
|
// the executable, but are under the same prefix (/usr or /usr/local).
|
|
static const string LOCAL_PATH = "/usr/local/";
|
|
static const string STANDARD_PATH = "/usr/";
|
|
- static const string RESOURCE_PATH = "share/games/endless-sky/";
|
|
+ static const string RESOURCE_PATH = "share/endless-sky/";
|
|
if(!resources.compare(0, LOCAL_PATH.length(), LOCAL_PATH))
|
|
resources = LOCAL_PATH + RESOURCE_PATH;
|
|
else if(!resources.compare(0, STANDARD_PATH.length(), STANDARD_PATH))
|