File euca2ools-2.0.1_mkFile-fixes.patch of Package euca2ools

--- Makefile.orig
+++ Makefile
@@ -31,14 +31,15 @@
 #
 # Author: Neil Soman neil@eucalyptus.com
 
-SUBDIRS                 =       euca2ools
-BINDIR			=	bin
-BINLIST			=	$(wildcard $(BINDIR)/*)
-MANDIR			=	man
-MANPAGES		=	$(shell echo $(BINLIST) | sed -e 's%$(BINDIR)/%$(MANDIR)/%g' -e 's/  */.1 /g').1
-PREFIX			=	/usr/local
-BASH_COMPLETION		=	/etc/bash_completion.d
-UTILDIR			=	util
+SUBDIRS         =euca2ools
+BINDIR		=bin
+BINLIST		=$(wildcard $(BINDIR)/*)
+MANDIR		=man
+MANPAGES	=$(shell echo $(BINLIST) | sed -e 's%$(BINDIR)/%$(MANDIR)/%g' -e 's/  */.1 /g').1
+PREFIX		=/usr/local
+BASH_COMPLETION	=/etc/bash_completion.d
+UTILDIR		=util
+MANPREFIX       =$(PREFIX)
  
 .PHONY: man all install clean distclean
 
@@ -56,10 +57,10 @@ man: $(BINLIST)
 	    done
 
 install:
-	python setup.py install
-	@install -o root -m 755 -d $(PREFIX)/man/man1
-	@if [ -d $(MANDIR) ]; then install -o root -m 644  $(MANDIR)/* $(PREFIX)/man/man1; fi
-	@if [ -d $(BASH_COMPLETION) ]; then install -o root -m 644  $(UTILDIR)/* $(BASH_COMPLETION); fi
+	python setup.py install --prefix=$(DESTDIR)$(PREFIX)
+	@install -m 755 -d $(DESTDIR)$(MANPREFIX)/man/man1
+	@if [ -d $(MANDIR) ]; then install -m 644  $(MANDIR)/* $(DESTDIR)$(MANPREFIX)/man/man1; fi
+	@if [ -d $(DESTDIR)$(BASH_COMPLETION) ]; then install -m 644  $(UTILDIR)/* $(DESTDIR)$(BASH_COMPLETION); fi
  
 distclean clean:
 	@for subdir in $(SUBDIRS); do \
@@ -67,6 +68,6 @@ distclean clean:
 
 uninstall:
 	@for x in $(BINLIST); do \
-		rm -f $(PREFIX)/bin/$$x ; \
-		rm -f $(PREFIX)/man/man1/`basename $$x`.1; done
-	@if [ -d $(BASH_COMPLETION) ]; then rm $(BASH_COMPLETION)/euca2ools; fi 
+		rm -f $(DESTDIR)$(PREFIX)/bin/$$x ; \
+		rm -f $(DESTDIR)$(MANPREFIX)/man/man1/`basename $$x`.1; done
+	@if [ -d $(DESTDIR)$(BASH_COMPLETION) ]; then rm $(DESTDIR)$(BASH_COMPLETION)/euca2ools; fi