--- client/Makefile.install.UNIX
+++ client/Makefile.install.UNIX
@@ -11,9 +11,9 @@
 #
 
 INSTALL      = install
-INSTBINFLAGS = -m 0755 -s
+INSTBINFLAGS = -m 0755
 INSTUIDFLAGS = -m 4755
-INSTLIBFLAGS = -m 0755 -s
+INSTLIBFLAGS = -m 0755
 INSTINCFLAGS = -m 0644
 INSTMANFLAGS = -m 0644
 INSTCFGFLAGS = -m 0644
@@ -26,8 +26,10 @@
 MKDIRFLAGS = -p
 
 
-GAMES_DIR   = $(PREFIX)/games
-XSW_DIR     = $(PREFIX)/share/games/xshipwars
+BINDIR      = $(PREFIX)/games
+GAMES_DIR   = $(DESTDIR)$(BINDIR)
+DATADIR     = $(PREFIX)/share/games
+XSW_DIR     = $(DESTDIR)$(DATADIR)/xshipwars
 XSW_ETC_DIR = $(XSW_DIR)/etc
 
 XSW_CFG_FILE   = xsw.ini
--- monitor/Makefile.install.UNIX
+++ monitor/Makefile.install.UNIX
@@ -27,8 +27,10 @@
 MKDIR      = mkdir
 MKDIRFLAGS = -p
 
-GAMES_DIR          = $(PREFIX)/games
-XSW_DIR            = $(PREFIX)/share/games/xshipwars
+BINDIR             = $(PREFIX)/games
+GAMES_DIR          = $(DESTDIR)$(BINDIR)
+DATADIR            = $(PREFIX)/share/games
+XSW_DIR            = $(DESTDIR)$(DATADIR)/xshipwars
 MONITOR_IMAGES_DIR = $(XSW_DIR)/images/monitor
 
 HR = "-------------------------------------------------------------------------"
--- server/Makefile.install.UNIX
+++ server/Makefile.install.UNIX
@@ -29,7 +29,7 @@
 MKDIRFLAGS = -p
 
 
-SWSERV_BASE_DIR = $(PREFIX)/swserv
+SWSERV_BASE_DIR = $(DESTDIR)$(PREFIX)/swserv
 
 SWSERV_BIN_DIR  = $(SWSERV_BASE_DIR)/bin
 SWSERV_DB_DIR   = $(SWSERV_BASE_DIR)/db
--- unvedit/Makefile.install.UNIX
+++ unvedit/Makefile.install.UNIX
@@ -26,8 +26,10 @@
 MKDIR      = mkdir
 MKDIRFLAGS = -p
 
-GAMES_BIN_DIR      = $(PREFIX)/games
-XSW_DATA_DIR       = $(PREFIX)/share/games/xshipwars
+BINDIR             = $(PREFIX)/games
+GAMES_BIN_DIR      = $(DESTDIR)$(BINDIR)
+DATADIR            = $(PREFIX)/share/games
+XSW_DATA_DIR       = $(DESTDIR)$(DATADIR)/xshipwars
 UNVEDIT_IMAGES_DIR = $(XSW_DATA_DIR)/images/unvedit
 
 HR = "-------------------------------------------------------------------------"
--- client/xsw.h.old	2007-07-06 08:02:07.000000000 +0200
+++ client/xsw.h	2007-07-06 08:04:05.000000000 +0200
@@ -135,10 +135,10 @@
 #define XSW_DEF_SW_SERVER_DIR		CWD_STR
 #else
 #define XSW_DEF_LOCAL_DATA_DIR		".shipwars"
-#define XSW_DEF_GLOBAL_DATA_DIR		PREFIX "/share/games/xshipwars"
-#define XSW_DEF_GLOBAL_IMAGES_DIR	PREFIX "/share/games/xshipwars/images"
-#define XSW_DEF_GLOBAL_SOUNDS_DIR	PREFIX "/share/games/xshipwars/sounds"
-#define XSW_DEF_GLOBAL_ETC_DIR		PREFIX "/share/games/xshipwars/etc"
+#define XSW_DEF_GLOBAL_DATA_DIR		"@GENTOO_DATADIR@"
+#define XSW_DEF_GLOBAL_IMAGES_DIR	"@GENTOO_DATADIR@/images"
+#define XSW_DEF_GLOBAL_SOUNDS_DIR	"@GENTOO_DATADIR@/sounds"
+#define XSW_DEF_GLOBAL_ETC_DIR		"@GENTOO_DATADIR@/etc"
 #define XSW_DEF_SW_SERVER_DIR		"/home/swserv"
 #endif