Index: olsrd-a5b9cf969979/Makefile
===================================================================
--- olsrd-a5b9cf969979.orig/Makefile	2008-02-06 19:32:49.000000000 +0100
+++ olsrd-a5b9cf969979/Makefile	2008-06-23 15:33:35.000000000 +0200
@@ -95,9 +95,8 @@
 install: install_olsrd
 
 install_bin:
-		mkdir -p $(SBINDIR)
-		install -m 755 $(EXENAME) $(SBINDIR)
-		$(STRIP) $(SBINDIR)/$(EXENAME)
+		mkdir -p $(INSTALL_PREFIX)$(SBINDIR)
+		install -m 755 $(EXENAME) $(INSTALL_PREFIX)$(SBINDIR)
 
 install_olsrd:	install_bin
 		@echo ========= C O N F I G U R A T I O N - F I L E ============
@@ -109,16 +108,15 @@
 		@echo per default.
 		@echo can be found at files/olsrd.conf.default.lq
 		@echo ==========================================================
-		mkdir -p $(ETCDIR)
-		-cp -i files/olsrd.conf.default.lq $(CFGFILE)
+		mkdir -p $(INSTALL_PREFIX)$(ETCDIR)
 		@echo -------------------------------------------
 		@echo Edit $(CFGFILE) before running olsrd!!
 		@echo -------------------------------------------
 		@echo Installing manpages $(EXENAME)\(8\) and $(CFGNAME)\(5\)
-		mkdir -p $(MANDIR)/man8/
-		cp files/olsrd.8.gz $(MANDIR)/man8/$(EXENAME).8.gz
-		mkdir -p $(MANDIR)/man5/
-		cp files/olsrd.conf.5.gz $(MANDIR)/man5/$(CFGNAME).5.gz
+		mkdir -p $(INSTALL_PREFIX)$(MANDIR)/man8/
+		cp files/olsrd.8.gz $(INSTALL_PREFIX)$(MANDIR)/man8/$(EXENAME).8.gz
+		mkdir -p $(INSTALL_PREFIX)$(MANDIR)/man5/
+		cp files/olsrd.conf.5.gz $(INSTALL_PREFIX)$(MANDIR)/man5/$(CFGNAME).5.gz
 
 tags:
 		$(TAGCMD) -o $(TAGFILE) $(TAG_SRCS)
@@ -140,7 +138,7 @@
 		$(MAKECMD) -C lib LIBDIR=$(LIBDIR) clean
 
 libs_install install_libs:
-		$(MAKECMD) -C lib LIBDIR=$(LIBDIR) install
+		$(MAKECMD) -C lib LIBDIR=$(INSTALL_PREFIX)$(LIBDIR) install
 
 httpinfo:
 		$(MAKECMD) -C lib/httpinfo clean