diff -ur tornado-1.3.orig/Makefile tornado-1.3/Makefile --- tornado-1.3.orig/Makefile 2003-11-20 16:26:22 +0300 +++ tornado-1.3/Makefile 2006-03-16 15:34:36 +0300 @@ -1,13 +1,5 @@ -CC = gcc -MAKE = make -LDFLAGS = -lncurses -OBJFILES = main.o draw.o erwin.o network.o scores.o -PREFIX = /usr/local -LOCALEPATH = /usr/local/share/locale -CFLAGS = -Wall -O2 -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\"" +include Makefile.inc VERSION = `grep " VERSION" version.h | sed s/\"//g | sed s/\#define\ VERSION\ //` -LOCALES = de -MAN = doc/man DISTDIR = tornado-$(VERSION) ### ### @@ -25,7 +17,7 @@ $(MAKE) -C $(MAN) all tornado: $(OBJFILES) - $(CC) $(LDFLAGS) $(OBJFILES) -o tornado + $(CC) $(OBJFILES) $(LDFLAGS) -o tornado debug: tornado.6 locales gcc -g -ggdb -Wall -ansi -pedantic -o tornado draw.c main.c erwin.c network.c scores.c -lncurses -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\"" @@ -48,19 +40,19 @@ fi install -s tornado $(PREFIX)/bin - $(MAKE) -C $(MAN) install-man + $(MAKE) PREFIX=$(PREFIX)/share -C $(MAN) install-man - if [ -f "/var/games/tornado.scores" ]; then \ + if [ -f "$(SCOREFILE)" ]; then \ echo "Skipping install of the highscores file. File exists."; \ - cat /var/games/tornado.scores | ./convert-highscorefile > score.tmp; \ - mv -f score.tmp /var/games/tornado.scores; \ - chmod a+rw-x "/var/games/tornado.scores"; \ + cat $(SCOREFILE) | ./convert-highscorefile > score.tmp; \ + mv -f score.tmp $(SCOREFILE); \ + chmod a+rw-x "$(SCOREFILE)"; \ else \ - if [ ! -d "/var/games" ]; then \ - mkdir /var/games; \ + if [ ! -d "$(SCOREPATH)" ]; then \ + mkdir -p $(SCOREPATH); \ fi; \ - install tornado.scores /var/games; \ - chmod a+w-x "/var/games/tornado.scores"; \ + install tornado.scores $(SCOREPATH); \ + chmod a+w-x "$(SCOREFILE)"; \ fi install-locale-data: @@ -68,7 +60,7 @@ uninstall: rm -f $(PREFIX)/bin/tornado - rm -f /var/games/tornado.scores + rm -f $(SCOREFILE) $(MAKE) -C $(MAN) uninstall $(MAKE) -C po uninstall @@ -82,19 +74,19 @@ if [ ! -d "$(PREFIX)/man/man6" ]; then \ mkdir -p $(PREFIX)/man/man6; \ fi - install -m 0644 tornado.6 $(PREFIX)/man/man6 + install -m 0644 tornado.6 $(PREFIX)/share/man/man6 - if [ -f "/var/games/tornado.scores" ]; then \ + if [ -f "$(SCOREFILE)" ]; then \ echo "Skipping install of the highscores file. File exists."; \ - cat /var/games/tornado.scores | ./convert-highscorefile > score.tmp; \ - mv -f score.tmp /var/games/tornado.scores; \ - chmod a+rw-x "/var/games/tornado.scores"; \ + cat $(SCOREFILE) | ./convert-highscorefile > score.tmp; \ + mv -f score.tmp $(SCOREFILE); \ + chmod a+rw-x "$(SCOREFILE)"; \ else \ - if [ ! -d "/var/games" ]; then \ - mkdir /var/games; \ + if [ ! -d "$(SCOREPATH)" ]; then \ + mkdir -p $(SCOREPATH); \ fi; \ - install tornado.scores /var/games; \ - chmod a+w-x "/var/games/tornado.scores"; \ + install tornado.scores $(SCOREPATH); \ + chmod a+w-x "$(SCOREFILE)"; \ fi dist: clean diff -ur tornado-1.3.orig/Makefile.inc tornado-1.3/Makefile.inc --- tornado-1.3.orig/Makefile.inc 2003-11-20 13:55:50 +0300 +++ tornado-1.3/Makefile.inc 2006-03-16 15:34:36 +0300 @@ -2,8 +2,11 @@ MAKE = make LDFLAGS = -lncurses OBJFILES = main.o draw.o erwin.o network.o scores.o -PREFIX = /usr/local -LOCALEPATH = /usr/local/share/locale -CFLAGS = -Wall -O2 -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\"" -LOCALES = de +ROOT = +PREFIX = $(ROOT)/usr +LOCALEPATH = $(PREFIX)/share/locale +SCOREPATH=$(ROOT)/var/lib/games/ +SCOREFILE=$(SCOREPATH)/tornado.scores +CFLAGS = -Wall -O2 -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\"" -DSCOREFILE_NAME="\"SCOREFILE\"" +LOCALES = ru MAN = doc/man diff -ur tornado-1.3.orig/scores.h tornado-1.3/scores.h --- tornado-1.3.orig/scores.h 2000-12-01 16:13:02 +0300 +++ tornado-1.3/scores.h 2006-03-16 15:35:27 +0300 @@ -1,7 +1,9 @@ /* scores.h -- highscore functions */ /* score file name */ +#ifndef SCOREFILE_NAME #define SCOREFILE_NAME "/var/games/tornado.scores" +#endif /* maximum length for a player name (includes \0) */ #define MAX_PLAYER_LEN 22