--- atanks-4.3.old/Makefile +++ atanks-4.3/Makefile @@ -1,17 +1,15 @@ VERSION=3.9 -PREFIX = /usr/ - -BINPREFIX = $(PREFIX) - -BINDIR = ${BINPREFIX}bin/ -INSTALLDIR = ${PREFIX}share/games/atanks +PREFIX = __META_PREFIX__/ +BINPREFIX = $(PREFIX) +BINDIR = ${BINPREFIX}bin/ +INSTALLDIR = ${PREFIX}data export VERSION export PREFIX export INSTALLDIR FILENAME=atanks-${VERSION} -INSTALL=$(PREFIX)bin/install -c +INSTALL=install -c DISTCOMMON=atanks/*.dat atanks/COPYING atanks/README atanks/TODO atanks/Changelog atanks/BUGS atanks/*.txt INCOMMON=COPYING README TODO Changelog *.txt unicode.dat --- atanks-4.3.old/src/Makefile +++ atanks-4.3/src/Makefile @@ -9,15 +9,15 @@ LD=g++ LIB=ar WINDRES= -# FLAGS += -DDATA_DIR=\".\" -Wno-write-strings -DNETWORK -DTHREADS -FLAGS += -DDATA_DIR=\"${INSTALLDIR}\" -Wno-write-strings -DNETWORK -DTHREADS +FLAGS += -DDATA_DIR=\"__META_PREFIX__/data\" -Wno-write-strings -DNETWORK -DTHREADS + OUTPUT = ../atanks WFLAGS = OFLAGS = LFLAGS += LDFLAGS = `allegro-config --libs` -CFLAGS += -g -Wall -Iinclude # -fprofile-arcs -ftest-coverage +CFLAGS += -O2 -Wall -Iinclude # -fprofile-arcs -ftest-coverage SRCS = $(MODULES:.o=.cpp) GLOBALS = main.h imagedefs.h externs.h --- atanks-4.3.old/src/main.h +++ atanks-4.3/src/main.h @@ -24,11 +24,10 @@ #define VERSION "4.3" #endif -#ifdef GENTOO -#ifndef DATA_DIR -#define DATA_DIR "/usr/share/games/atanks" -#endif +#ifdef DATA_DIR +#undef DATA_DIR #endif +#define DATA_DIR "__META_PREFIX__/data" #ifndef BUFFER_SIZE #define BUFFER_SIZE 256 @@ -41,20 +40,21 @@ #define _WARNUNUSED __attribute__ ((warn_unused_result)) #endif // _WARNUNUSED -#include -#ifdef WIN32 -#include -#endif #include #include #include #include #include -#include "imagedefs.h" #include #include +#include +#ifdef WIN32 +#include +#endif +#include "imagedefs.h" + #ifdef LINUX #include #endif /* LINUX */