--- Makefile.orig	2008-03-16 00:44:45.000000000 +0100
+++ Makefile	2008-09-26 19:44:38.000000000 +0200
@@ -13,15 +13,13 @@
 	rm -f *~ src/*~
 
 install: compile
-	install -d $(ROOT)/bin $(ROOT)/conf $(ROOT)/docs
-	install -d -o $(OWNER) -g $(GROUP) $(ROOT)/logs $(ROOT)/data/pids $(ROOT)/data/httpd
-	test -f $(ROOT)/conf/httpd.conf || install -m 644 conf/httpd.conf* $(ROOT)/conf
-	install -b -m 644 conf/countries* conf/regions* $(ROOT)/conf
-	install -b -m 644 docs/*.txt $(ROOT)/docs
-	install -b bin/update-countries.sh src/httpd/convert-ranges src/httpd/convert-geoip $(ROOT)/bin
-	install -b -m 6755 -o $(OWNER) -g $(GROUP) src/httpd/0W-httpd $(ROOT)/bin
-	@echo
-	@echo "Installed, run as root: $(ROOT)/bin/0W-httpd [-h]"
+	install -d $(DESTDIR)$(ROOT)/0W-httpd/data $(DESTDIR)$(ROOT)/0W-httpd/logs $(DESTDIR)$(ROOT)/0W-httpd/pids
+	$(BSD_INSTALL_SCRIPT) bin/update-countries.sh $(DESTDIR)$(ROOT)/bin
+	$(BSD_INSTALL_PROGRAM) src/httpd/convert-ranges src/httpd/convert-geoip $(DESTDIR)$(ROOT)/bin
+	$(BSD_INSTALL_PROGRAM) src/httpd/0W-httpd $(DESTDIR)$(ROOT)/sbin
+	mkdir -p $(DESTDIR)$(ROOT)/etc/0W-httpd
+	$(BSD_INSTALL_DATA) conf/countries* $(DESTDIR)$(ROOT)/etc/0W-httpd
+	$(BSD_INSTALL_DATA) conf/httpd.conf $(DESTDIR)$(ROOT)/etc/0W-httpd/httpd.conf.sample
 
 upgrade: install
 	$(ROOT)/bin/0W-httpd -t
