diff --git a/Makefile b/Makefile index a34df61..b07782b 100644 --- a/Makefile +++ b/Makefile @@ -3,11 +3,10 @@ #-O3 --std=c99 -lcurses -DNO_MOUSE for NetBSD curses #adding --std=c99 makes warnings in GNU, and the blame is upon glibc feature test macros. my code is correct. -GAMES_DIR?=$(PREFIX)/usr/games -SCORES_DIR?=$(PREFIX)/var/games -MAN_DIR?=$(PREFIX)/usr/share/man/man6 -CFLAGS+= -Wno-unused-result -D SCORES_DIR=\"$(PREFIX)$(SCORES_DIR)\" -PKG-CONFIG?=pkg-config +GAMESDIR?=$(PREFIX)/usr/games +SCORESDIR?=$(PREFIX)/var/games +MANDIR?=$(PREFIX)/usr/share/man/man6 +CFLAGS=-Wno-unused-result -DSCORES_DIR=\"$(PREFIX)$(SCORESDIR)\" LIBS=$(shell pkg-config --libs --cflags ncurses) -lm @@ -17,11 +16,11 @@ SCORE_FILES= pipes_scores jewels_scores miketron_scores muncher_scores fisher_sc all: $(ALL) scorefiles: - for sf in $(SCORE_FILES); do touch $(DESTDIR)$(SCORES_DIR)/$$sf ; chmod 664 $(DESTDIR)$(SCORES_DIR)/$$sf; chown :games $(DESTDIR)$(SCORES_DIR)/$$sf ; done; - for game in $(ALL); do chown :games $(DESTDIR)$(GAMES_DIR)/$$game; chmod g $(DESTDIR)$(GAMES_DIR)/$$game ; done; + for sf in $(SCORE_FILES); do touch $(DESTDIR)$(SCORESDIR)/$$sf ; chmod 664 $(DESTDIR)$(SCORESDIR)/$$sf; chown :games $(DESTDIR)$(SCORESDIR)/$$sf ; done; + for game in $(ALL); do chown :games $(DESTDIR)$(GAMESDIR)/$$game; chmod g $(DESTDIR)$(GAMESDIR)/$$game ; done; manpages: - cp man/* $(DESTDIR)$(MAN_DIR) + cp man/* $(DESTDIR)$(MANDIR) jewels: jewels.c config.h common.h $(CC) $(CFLAGS) $< $(LDFLAGS) $(LIBS) -o $@ sudoku: sudoku.c config.h @@ -66,9 +65,9 @@ menu: clean: for game in $(ALL); do rm $$game; done; uninstall: - for game in $(ALL); do rm $(GAMES_DIR)/$$game; rm $(MAN_DIR)/$$game.6.gz ;done; + for game in $(ALL); do rm $(GAMESDIR)/$$game; rm $(MANDIR)/$$game.6.gz ;done; install: $(ALL) - cp $(ALL) $(DESTDIR)/$(GAMES_DIR) + cp $(ALL) $(DESTDIR)/$(GAMESDIR) test: for game in $(ALL); do ./$$game ;done; @@ -78,8 +77,8 @@ nb: for game in $(ALL); do cp $$game nb$$game ;done; for manpage in $(ls man); do cp man/$$manpage man/nb$$manpage ;done; nbinstall: nb - cp nb* $(DESTDIR)/$(GAMES_DIR) + cp nb* $(DESTDIR)/$(GAMESDIR) nbmanpages: nb - cp man/nb* $(DESTDIR)/$(MAN_DIR) + cp man/nb* $(DESTDIR)/$(MANDIR) nbclean: for game in $(ALL); do rm nb$$game; done;