From a37b832e78b8443f17669737507f4b0677750314 Mon Sep 17 00:00:00 2001 From: Giulio De Stasio Date: Tue, 22 Aug 2023 05:40:28 +0200 Subject: [PATCH] fix installation path for unix Signed-off-by: Giulio De Stasio --- Quake/Makefile | 13 ++++++++++--- Quake/quakedef.h | 13 +++++++++---- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Quake/Makefile b/Quake/Makefile index e0eabc087..90b9f6eb4 100644 --- a/Quake/Makefile +++ b/Quake/Makefile @@ -290,7 +290,7 @@ OBJS += $(SYSOBJ_RES) # targets / rules # --------------------------- -.PHONY: clean debug release +.PHONY: clean debug release uninstall DEFAULT_TARGET := ironwail all: $(DEFAULT_TARGET) @@ -315,8 +315,15 @@ clean: $(MAKEFILE) $(RM) *.o *.d $(DEFAULT_TARGET) install: ironwail - cp ironwail /usr/local/games/quake - cp ironwail.pak /usr/local/games/quake + mkdir -p /usr/local/games/quake/ + mkdir -p /usr/local/share/ironwail + cp ironwail /usr/local/games/ironwail + cp ironwail.pak /usr/local/share/ironwail/ironwail.pak + +uninstall: + rm /usr/local/games/quake/ironwail.pak + rmdir /usr/local/games/quake + rm /usr/local/games/ironwail #--------------------------------------------------------------- # include dependencies (if not running 'clean' target) diff --git a/Quake/quakedef.h b/Quake/quakedef.h index b208d2b73..7631dbaed 100644 --- a/Quake/quakedef.h +++ b/Quake/quakedef.h @@ -57,10 +57,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define IRONWAIL_VER_STRING QS_STRINGIFY(IRONWAIL_VER_MAJOR) "." QS_STRINGIFY(IRONWAIL_VER_MINOR) "." QS_STRINGIFY(IRONWAIL_VER_PATCH) IRONWAIL_VER_SUFFIX #define CONSOLE_TITLE_STRING "Ironwail " IRONWAIL_VER_STRING -#define WINDOW_TITLE_STRING "Quake/Ironwail " IRONWAIL_VER_STRING -#define CONFIG_NAME "ironwail.cfg" -#define SCREENSHOT_PREFIX "ironwail" -#define ENGINE_PAK "ironwail.pak" +#define WINDOW_TITLE_STRING "Quake/Ironwail " IRONWAIL_VER_STRING +#define CONFIG_NAME "ironwail.cfg" +#define SCREENSHOT_PREFIX "ironwail" +#if defined(__unix) +#define ENGINE_PATH_UNIX "/usr/local/share" +#define ENGINE_PAK ENGINE_PATH_UNIX "/ironwail/ironwail.pak" +#else +#define ENFINE_PAK "ironwail.pak" +#endif #define ENGINE_USERDIR_WIN "Ironwail" #define ENGINE_USERDIR_OSX "Ironwail" #define ENGINE_USERDIR_UNIX ".ironwail"