1 files changed, 15 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index ddf1e05..d2e0c2d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
-PREFIX?=..
+PREFIX?=/usr/local
 BINDIR?=$(PREFIX)/bin
+MANDIR?=$(PREFIX)/share/man
 STRIP?=strip
 
 #FEATURES+=-DWANT_V4_ONLY
@@ -19,6 +20,12 @@ STRIP?=strip
 #FEATURES+=-DWANT_DEV_RANDOM
 FEATURES+=-DWANT_FULLSCRAPE
 
+# Buckets the torrent table is split into, as a power of two, 8 to 16. More
+# buckets make inserting a new torrent cheaper and cost memory, which is worth
+# it for a tracker carrying millions of torrents and not for one carrying
+# thousands. DESIGN has the measurements.
+FEATURES+=-DOT_BUCKET_COUNT_BITS=10
+
 #FEATURES+=-D_DEBUG_HTTPERROR
 #FEATURES+=-D_DEBUG_RANDOMTORRENTS
 
@@ -33,7 +40,6 @@ include Mk/gzip.mk
 
 CFLAGS?=-O3
 
-# What the build requires, whatever you do to those.
 OT_CFLAGS+=-Wall -Wextra -Wwrite-strings -pipe -pthread
 OT_LDFLAGS+=-pthread
 
@@ -43,8 +49,8 @@ COMPILE=$(CPPFLAGS) $(OT_CFLAGS) $(FEATURES)
 LINK=$(LDFLAGS) $(OT_LDFLAGS) $(LDLIBS) $(OT_LDLIBS)
 
 BINARY=opentracker
-HEADERS=trackerlogic.h ot_urlencoded.h ot_batch.h ot_buf.h ot_event.h ot_fdstate.h ot_fmt.h ot_hex.h ot_ip.h ot_config.h ot_scan.h ot_socket.h ot_tcp.h ot_worker.h ot_workqueue.h ot_mutex.h ot_random.h ot_stats.h ot_vector.h ot_clean.h ot_udp.h ot_iovec.h ot_fullscrape.h ot_accesslist.h ot_http.h ot_livesync.h ot_rijndael.h
-SOURCES=opentracker.c trackerlogic.c ot_urlencoded.c ot_batch.c ot_buf.c ot_event.c ot_fdstate.c ot_fmt.c ot_hex.c ot_ip.c ot_config.c ot_scan.c ot_socket.c ot_tcp.c ot_worker.c ot_workqueue.c ot_mutex.c ot_random.c ot_stats.c ot_vector.c ot_clean.c ot_udp.c ot_iovec.c ot_fullscrape.c ot_accesslist.c ot_http.c ot_livesync.c ot_rijndael.c
+HEADERS=src/trackerlogic.h src/ot_urlencoded.h src/ot_batch.h src/ot_buf.h src/ot_event.h src/ot_fdstate.h src/ot_fmt.h src/ot_hex.h src/ot_ip.h src/ot_config.h src/ot_scan.h src/ot_socket.h src/ot_tcp.h src/ot_worker.h src/ot_workqueue.h src/ot_mutex.h src/ot_random.h src/ot_stats.h src/ot_vector.h src/ot_clean.h src/ot_udp.h src/ot_iovec.h src/ot_fullscrape.h src/ot_accesslist.h src/ot_http.h src/ot_livesync.h src/ot_rijndael.h
+SOURCES=src/opentracker.c src/trackerlogic.c src/ot_urlencoded.c src/ot_batch.c src/ot_buf.c src/ot_event.c src/ot_fdstate.c src/ot_fmt.c src/ot_hex.c src/ot_ip.c src/ot_config.c src/ot_scan.c src/ot_socket.c src/ot_tcp.c src/ot_worker.c src/ot_workqueue.c src/ot_mutex.c src/ot_random.c src/ot_stats.c src/ot_vector.c src/ot_clean.c src/ot_udp.c src/ot_iovec.c src/ot_fullscrape.c src/ot_accesslist.c src/ot_http.c src/ot_livesync.c src/ot_rijndael.c
 BINARIES=$(BINARY) $(BINARY).debug
 
 # Everything is built in one go from sources, so there are no object files to
@@ -67,10 +73,13 @@ $(BUILDSTAMP): FORCE
         @echo "$(CFLAGS) $(COMPILE) $(LINK)" | cmp -s - $@ 2>/dev/null || echo "$(CFLAGS) $(COMPILE) $(LINK)" > $@
 
 clean:
-        rm -rf $(BINARIES) $(BINARIES:=.dSYM) $(BUILDSTAMP) *.o *~
+        rm -rf $(BINARIES) $(BINARIES:=.dSYM) $(BUILDSTAMP) *.o *~ src/*.o src/*~
 
-install:
+install: $(BINARY)
+        install -d $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5
         install -m 755 $(BINARY) $(DESTDIR)$(BINDIR)
+        install -m 644 man1/opentracker.1 $(DESTDIR)$(MANDIR)/man1
+        install -m 644 man5/opentracker.conf.5 $(DESTDIR)$(MANDIR)/man5
 
 FORCE: