X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=Makefile;h=a10f41a572dd83c79d3a54ba5b0b107979e19c00;hb=cb769b76c094d53c1423af9d4f6d1eb84fbfb0e5;hp=e8cdb17b9850aa660b52d6636523d2656ddc91be;hpb=642bce16a1ae8b84a824beb913cc7f1f39599983;p=wumpus.git

diff --git a/Makefile b/Makefile
index e8cdb17..a10f41a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,11 @@
 #
 # Makefile for `Hunt the Wumpus' and `Superhack' games
 #
-VERS=1.6
+VERS=1.9
+
+prefix?=/usr
+
+CFLAGS = -Wall
 
 all: wumpus superhack
 
@@ -12,7 +16,7 @@ superhack: superhack.c
 	$(CC) $(CFLAGS) superhack.c -o superhack
 
 clean:
-	rm -f wumpus wumpus.o superhack superhack.o TAGS 
+	rm -f wumpus wumpus.o superhack superhack.o TAGS *.6 
 	rm -f *~ *.1 *.html *.tar.gz MANIFEST
 
 TAGS:
@@ -24,15 +28,20 @@ wumpus.6: wumpus.xml
 wumpus.html: wumpus.xml
 	xmlto html-nochunks wumpus.xml 
 
-SOURCES = README COPYING NEWS Makefile wumpus.c superhack.c wumpus.xml
+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
+
+reflow:
+	@clang-format --style="{IndentWidth: 8, UseTab: ForIndentation}" -i $$(find . -name "*.[ch]")
 
 CPPCHECKOPTS =
 cppcheck:
@@ -47,7 +56,7 @@ wumpus-$(VERS).tar.gz: $(SOURCES) wumpus.6
 
 dist: wumpus-$(VERS).tar.gz
 
-release: wumpus-$(VERS).tar.gz wumpus.html
+release: wumpus-$(VERS).tar.gz wumpus.html wumpus.6
 	shipper version=$(VERS) | sh -e -x
 
 refresh: wumpus.html