42 lines
2.0 KiB
Diff
42 lines
2.0 KiB
Diff
--- SConstruct~ 2021-04-19 08:27:12.592216308 -0500
|
|
+++ SConstruct 2021-04-19 08:29:26.504082300 -0500
|
|
@@ -191,11 +191,11 @@
|
|
RecursiveInstall(env, pathjoin(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")
|
|
--- SConstruct~ 2021-04-19 08:35:52.599227069 -0500
|
|
+++ SConstruct 2021-04-19 08:49:58.917530861 -0500
|
|
@@ -142,7 +142,7 @@
|
|
|
|
|
|
# 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")
|
|
--- source/Files.cpp~ 2021-04-17 09:40:38.000000000 -0500
|
|
+++ source/Files.cpp 2021-04-19 09:05:31.921109831 -0500
|
|
@@ -119,7 +119,7 @@
|
|
// 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))
|