Attachment #209546 for bug #292052

View | Details | Raw Unified | Return to bug 292052
Collapse All | Expand All

Line Link Here

(-)file_not_specified_in_diff (-13 / +19 lines)
0	-- client/Makefile.install.UNIX	0	++ client/Makefile.install.UNIX
Lines 11-19 Link Here
11	#	11	#
12		12
13	INSTALL = install	13	INSTALL = install
14	INSTBINFLAGS = -m 0755 -s	14	INSTBINFLAGS = -m 0755
15	INSTUIDFLAGS = -m 4755	15	INSTUIDFLAGS = -m 4755
16	INSTLIBFLAGS = -m 0755 -s	16	INSTLIBFLAGS = -m 0755
17	INSTINCFLAGS = -m 0644	17	INSTINCFLAGS = -m 0644
18	INSTMANFLAGS = -m 0644	18	INSTMANFLAGS = -m 0644
19	INSTCFGFLAGS = -m 0644	19	INSTCFGFLAGS = -m 0644
Lines 26-33 Link Here
26	MKDIRFLAGS = -p	26	MKDIRFLAGS = -p
27		27
28		28
29	GAMES_DIR = $(PREFIX)/games	29	BINDIR = $(PREFIX)/games
30	XSW_DIR = $(PREFIX)/share/games/xshipwars	30	GAMES_DIR = $(DESTDIR)$(BINDIR)
		31	DATADIR = $(PREFIX)/share/games
		32	XSW_DIR = $(DESTDIR)$(DATADIR)/xshipwars
31	XSW_ETC_DIR = $(XSW_DIR)/etc	33	XSW_ETC_DIR = $(XSW_DIR)/etc
32		34
33	XSW_CFG_FILE = xsw.ini	35	XSW_CFG_FILE = xsw.ini
34	-- monitor/Makefile.install.UNIX	36	++ monitor/Makefile.install.UNIX
Lines 27-34 Link Here
27	MKDIR = mkdir	27	MKDIR = mkdir
28	MKDIRFLAGS = -p	28	MKDIRFLAGS = -p
29		29
30	GAMES_DIR = $(PREFIX)/games	30	BINDIR = $(PREFIX)/games
31	XSW_DIR = $(PREFIX)/share/games/xshipwars	31	GAMES_DIR = $(DESTDIR)$(BINDIR)
		32	DATADIR = $(PREFIX)/share/games
		33	XSW_DIR = $(DESTDIR)$(DATADIR)/xshipwars
32	MONITOR_IMAGES_DIR = $(XSW_DIR)/images/monitor	34	MONITOR_IMAGES_DIR = $(XSW_DIR)/images/monitor
33		35
34	HR = "-------------------------------------------------------------------------"	36	HR = "-------------------------------------------------------------------------"
35	-- server/Makefile.install.UNIX	37	++ server/Makefile.install.UNIX
Lines 29-35 Link Here
29	MKDIRFLAGS = -p	29	MKDIRFLAGS = -p
30		30
31		31
32	SWSERV_BASE_DIR = $(PREFIX)/swserv	32	SWSERV_BASE_DIR = $(DESTDIR)$(PREFIX)/swserv
33		33
34	SWSERV_BIN_DIR = $(SWSERV_BASE_DIR)/bin	34	SWSERV_BIN_DIR = $(SWSERV_BASE_DIR)/bin
35	SWSERV_DB_DIR = $(SWSERV_BASE_DIR)/db	35	SWSERV_DB_DIR = $(SWSERV_BASE_DIR)/db
36	-- unvedit/Makefile.install.UNIX	36	++ unvedit/Makefile.install.UNIX
Lines 26-33 Link Here
26	MKDIR = mkdir	26	MKDIR = mkdir
27	MKDIRFLAGS = -p	27	MKDIRFLAGS = -p
28		28
29	GAMES_BIN_DIR = $(PREFIX)/games	29	BINDIR = $(PREFIX)/games
30	XSW_DATA_DIR = $(PREFIX)/share/games/xshipwars	30	GAMES_BIN_DIR = $(DESTDIR)$(BINDIR)
		31	DATADIR = $(PREFIX)/share/games
		32	XSW_DATA_DIR = $(DESTDIR)$(DATADIR)/xshipwars
31	UNVEDIT_IMAGES_DIR = $(XSW_DATA_DIR)/images/unvedit	33	UNVEDIT_IMAGES_DIR = $(XSW_DATA_DIR)/images/unvedit
32		34
33	HR = "-------------------------------------------------------------------------"	35	HR = "-------------------------------------------------------------------------"

Lines 135-144 Link Here

(-)client/xsw.h.old (-4 / +4 lines)
135	#define XSW_DEF_SW_SERVER_DIR CWD_STR	135	#define XSW_DEF_SW_SERVER_DIR CWD_STR
136	#else	136	#else
137	#define XSW_DEF_LOCAL_DATA_DIR ".shipwars"	137	#define XSW_DEF_LOCAL_DATA_DIR ".shipwars"
138	#define XSW_DEF_GLOBAL_DATA_DIR PREFIX "/share/games/xshipwars"	138	#define XSW_DEF_GLOBAL_DATA_DIR "@GENTOO_DATADIR@"
139	#define XSW_DEF_GLOBAL_IMAGES_DIR PREFIX "/share/games/xshipwars/images"	139	#define XSW_DEF_GLOBAL_IMAGES_DIR "@GENTOO_DATADIR@/images"
140	#define XSW_DEF_GLOBAL_SOUNDS_DIR PREFIX "/share/games/xshipwars/sounds"	140	#define XSW_DEF_GLOBAL_SOUNDS_DIR "@GENTOO_DATADIR@/sounds"
141	#define XSW_DEF_GLOBAL_ETC_DIR PREFIX "/share/games/xshipwars/etc"	141	#define XSW_DEF_GLOBAL_ETC_DIR "@GENTOO_DATADIR@/etc"
142	#define XSW_DEF_SW_SERVER_DIR "/home/swserv"	142	#define XSW_DEF_SW_SERVER_DIR "/home/swserv"
143	#endif	143	#endif
144		144

Return to bug 292052