File euca2ools-1.3.1_mkFile-fixes.patch of Package euca2ools
--- Makefile
+++ 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 build install clean distclean
@@ -54,12 +55,12 @@
install: build
@for subdir in $(SUBDIRS); do \
- (cd $$subdir && $(MAKE) $@) || exit $$? ; done
- @install -g root -o root -m 755 -d $(PREFIX)/bin
- @install -g root -o root -m 755 bin/* $(PREFIX)/bin/
- @install -g root -o root -m 755 -d $(PREFIX)/man/man1
- @if [ -d $(MANDIR) ]; then install -g root -o root -m 644 $(MANDIR)/* $(PREFIX)/man/man1; fi
- @if [ -d $(BASH_COMPLETION) ]; then install -g root -o root -m 644 $(UTILDIR)/* $(BASH_COMPLETION); fi
+ (cd $$subdir && $(MAKE) DESTDIR=$(DESTDIR) PREFIX=$(PREFIX) $@) || exit $$? ; done
+ @install -m 755 -d $(DESTDIR)$(PREFIX)/bin
+ @install -m 755 bin/* $(DESTDIR)$(PREFIX)/bin/
+ @install -m 755 -d $(DESTDIR)$(MANPREFIX)/man/man1
+ @install -m 644 $(MANDIR)/* $(DESTDIR)$(MANPREFIX)/man/man1
+ @if [ -d $(DESTDIR)$(BASH_COMPLETION) ]; then install $(UTILDIR)/* $(DESTDIR)$(BASH_COMPLETION); fi
distclean clean:
@for subdir in $(SUBDIRS); do \
@@ -67,6 +68,6 @@
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)$(PREFIX)/man/man1/`basename $$x`.1; done
+ @if [ -d $(DESTDIR)$(BASH_COMPLETION) ]; then rm $(DESTDIR)$(BASH_COMPLETION)/euca2ools; fi
--- euca2ools/Makefile
+++ euca2ools/Makefile
@@ -37,7 +37,7 @@
python setup.py build
install:
- python setup.py install
+ python setup.py install --prefix=$(DESTDIR)$(PREFIX)
clean:
python setup.py clean