Index: Makefile.in
--- Makefile.in.orig	2002-04-03 04:49:35.000000000 +0200
+++ Makefile.in	2004-05-07 22:43:21.000000000 +0200
@@ -42,7 +42,7 @@
 WEBGROUP =	www
 
 # CONFIGURE: Directory for CGI executables.
-CGIBINDIR =	$(WEBDIR)/cgi-bin
+CGIBINDIR =	$(prefix)/cgi
 
 # You shouldn't need to edit anything below here.
 
@@ -110,11 +110,11 @@
 
 installthis:
 	-mkdir -p $(DESTDIR)$(BINDIR)
-	$(INSTALL) -m 555 -o bin -g bin thttpd $(DESTDIR)$(BINDIR)
+	$(INSTALL) -m 555 thttpd $(DESTDIR)$(BINDIR)
 
 install-man:
 	-mkdir -p $(DESTDIR)$(MANDIR)/man8
-	$(INSTALL) -m 444 -o bin -g bin thttpd.8 $(DESTDIR)$(MANDIR)/man8
+	$(INSTALL) -m 444 thttpd.8 $(DESTDIR)$(MANDIR)/man8
 
 installsubdirs:
 	for i in $(SUBDIRS) ; do ( \
Index: cgi-src/Makefile.in
--- cgi-src/Makefile.in.orig	2001-11-12 22:52:00.000000000 +0100
+++ cgi-src/Makefile.in	2004-05-07 22:42:40.000000000 +0200
@@ -27,7 +27,7 @@
 prefix =	@prefix@
 exec_prefix =	@exec_prefix@
 WEBDIR =	$(prefix)/www
-CGIBINDIR =	$(WEBDIR)/cgi-bin
+CGIBINDIR =	$(prefix)/cgi
 MANDIR =	@mandir@
 
 CC =		@CC@
Index: extras/Makefile.in
--- extras/Makefile.in.orig	2001-11-12 22:52:55.000000000 +0100
+++ extras/Makefile.in	2004-05-07 22:44:32.000000000 +0200
@@ -66,18 +66,16 @@
 
 
 install:	all
-	rm -f $(BINDIR)/makeweb $(BINDIR)/htpasswd $(BINDIR)/syslogtocern
-	cp makeweb $(BINDIR)/makeweb
-	chgrp $(WEBGROUP) $(BINDIR)/makeweb
-	chmod 2755 $(BINDIR)/makeweb
-	cp htpasswd $(BINDIR)/htpasswd
-	cp syslogtocern $(BINDIR)/syslogtocern
-	rm -f $(MANDIR)/man1/makeweb.1
-	cp makeweb.1 $(MANDIR)/man1/makeweb.1
-	rm -f $(MANDIR)/man1/htpasswd.1
-	cp htpasswd.1 $(MANDIR)/man1/htpasswd.1
-	rm -f $(MANDIR)/man8/syslogtocern.8
-	cp syslogtocern.8 $(MANDIR)/man8/syslogtocern.8
+	rm -f $(DESTDIR)$(BINDIR)/makeweb $(DESTDIR)$(BINDIR)/htpasswd $(DESTDIR)$(BINDIR)/syslogtocern
+	cp makeweb $(DESTDIR)$(BINDIR)/makeweb
+	cp htpasswd $(DESTDIR)$(BINDIR)/htpasswd
+	cp syslogtocern $(DESTDIR)$(BINDIR)/syslogtocern
+	rm -f $(DESTDIR)$(MANDIR)/man1/makeweb.1
+	cp makeweb.1 $(DESTDIR)$(MANDIR)/man1/makeweb.1
+	rm -f $(DESTDIR)$(MANDIR)/man1/htpasswd.1
+	cp htpasswd.1 $(DESTDIR)$(MANDIR)/man1/htpasswd.1
+	rm -f $(DESTDIR)$(MANDIR)/man8/syslogtocern.8
+	cp syslogtocern.8 $(DESTDIR)$(MANDIR)/man8/syslogtocern.8
 
 clean:
 	rm -f $(CLEANFILES)
