--- client/platforms.ini +++ client/platforms.ini @@ -199,7 +199,7 @@ PlatformFeature = X11 Description = X Window Systems MustExist = Yes - FeatureCFLAGS = -DUSE_XSHM -DHAVE_MWMUTIL_H + FeatureCFLAGS = -DUSE_XSHM -DHAVE_MWMUTIL_H -DHAVE_X FeatureLIBS = -lX11 -lXext FeatureLIB_DIR = -L/usr/X11R6/lib/ FeatureDepend = X11-lib --- unvedit/platforms.ini +++ unvedit/platforms.ini @@ -140,7 +140,7 @@ PlatformFeature = X11 Description = X Window Systems MustExist = Yes - FeatureCFLAGS = -DUSE_XSHM -DHAVE_MWMUTIL_H + FeatureCFLAGS = -DUSE_XSHM -DHAVE_MWMUTIL_H -DHAVE_X FeatureLIBS = -lX11 -lXext FeatureLIB_DIR = -L/usr/X11R6/lib/ FeatureDepend = X11-lib --- monitor/platforms.ini +++ monitor/platforms.ini @@ -140,7 +140,7 @@ PlatformFeature = X11 Description = X Window Systems MustExist = Yes - FeatureCFLAGS = -DUSE_XSHM -DHAVE_MWMUTIL_H + FeatureCFLAGS = -DUSE_XSHM -DHAVE_MWMUTIL_H -DHAVE_X FeatureLIBS = -lX11 -lXext FeatureLIB_DIR = -L/usr/X11R6/lib/ FeatureDepend = X11-lib --- 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 = "-------------------------------------------------------------------------"