X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=6b19476b194fd1d1d28b578e181acee90d37f2ca;hb=e908716dca1112d6f920974b0bec0f628910f250;hp=1091fb3253cfaac90fb419b2526c900002f4fffa;hpb=9b6a2cc120fcebcd988e7076c1963bf9b1206021;p=wumpus.git

diff --git a/Makefile b/Makefile
index 1091fb3..6b19476 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,11 @@
 #
 # Makefile for `Hunt the Wumpus' and `Superhack' games
 #
-VERS=$(shell sed <wumpus.spec -n -e '/Version: \(.*\)/s//\1/p')
+VERS=1.6
+
+prefix?=/usr
+
+CFLAGS = -Wall
 
 all: wumpus superhack
 
@@ -13,7 +17,7 @@ superhack: superhack.c
 
 clean:
 	rm -f wumpus wumpus.o superhack superhack.o TAGS 
-	rm *~ *.1 *.html *.tar.gz SHIPPER.*
+	rm -f *~ *.1 *.html *.tar.gz MANIFEST
 
 TAGS:
 	etags wumpus.c
@@ -24,15 +28,22 @@ wumpus.6: wumpus.xml
 wumpus.html: wumpus.xml
 	xmlto html-nochunks wumpus.xml 
 
-SOURCES = README COPYING Makefile wumpus.c superhack.c wumpus.xml wumpus.spec
+SOURCES = README COPYING NEWS control Makefile wumpus.c superhack.c wumpus.xml wumpus.png wumpus.desktop superhack.desktop
 
-install: wumpus.6
-	cp wumpus superhack /usr/bin/
-	cp wumpus.6 /usr/share/man/man6/
+install: wumpus superhack wumpus.6
+	mkdir -p $(prefix)/bin
+	mkdir -p $(prefix)/share/man/man6
+	cp wumpus superhack $(prefix)/bin/
+	cp wumpus.6 $(prefix)/share/man/man6/
 
 uninstall:
-	rm /usr/bin/wumpus /usr/bin/superhack
-	rm /usr/share/man/man6/wumpus.6
+	rm $(prefix)/bin/wumpus $(prefix)/bin/superhack
+	rm $(prefix)/share/man/man6/wumpus.6
+
+CPPCHECKOPTS =
+cppcheck:
+	cppcheck -DREVISION=$(VERS) $(CPPCHECKOPTS) wumpus.c
+	cppcheck -DREVISION=$(VERS) $(CPPCHECKOPTS) superhack.c
 
 wumpus-$(VERS).tar.gz: $(SOURCES) wumpus.6
 	@ls $(SOURCES) wumpus.6 | sed s:^:wumpus-$(VERS)/: >MANIFEST
@@ -43,4 +54,7 @@ wumpus-$(VERS).tar.gz: $(SOURCES) wumpus.6
 dist: wumpus-$(VERS).tar.gz
 
 release: wumpus-$(VERS).tar.gz wumpus.html
-	shipper -u -m -t; make clean
+	shipper version=$(VERS) | sh -e -x
+
+refresh: wumpus.html
+	shipper -N -w version=$(VERS) | sh -e -x