nixos-linapple/asset-dir.patch

35 lines
1.1 KiB
Diff
Raw Permalink Normal View History

2024-08-23 12:03:24 -05:00
diff --git a/Makefile b/Makefile
index 5988c93..aaf499e 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,7 @@ ifdef REGISTRY_WRITEABLE
CFLAGS += "-DREGISTRY_WRITEABLE=1"
endif
-CFLAGS += -DASSET_DIR=\"$(DATADIR)\" -DVERSIONSTRING=\"$(VERSION)\"
+CFLAGS += -DASSET_DIR=\"$(DESTDIR)/$(DATADIR)\" -DVERSIONSTRING=\"$(VERSION)\"
CFLAGS += $(SDL_CFLAGS)
CFLAGS += $(CURL_CFLAGS)
# Do not complain about XPMs
diff --git a/src/asset.cpp b/src/asset.cpp
index 999b9db..8c8cd9f 100644
--- a/src/asset.cpp
+++ b/src/asset.cpp
@@ -135,7 +135,7 @@ int Asset_FindMasterDisk(char *path_out)
// TODO the last ditch paths are bunk -- look for better conventions.
int err = 255;
- const int count = 5;
+ const int count = 6;
char *paths[count];
char path[MAX_PATH+1];
@@ -150,6 +150,7 @@ int Asset_FindMasterDisk(char *path_out)
strcat(paths[2], "/.local/share/linapple");
strcpy(paths[3], "/usr/local/share/linapple");
strcpy(paths[4], "/usr/share/linapple");
+ strcpy(paths[5], ASSET_DIR);
for (auto p: paths) {
sprintf(path, "%s/%s", p, ASSET_MASTER_DSK);