From c0676d7d48d0a6f20e76401cc59a22f62992e155 Mon Sep 17 00:00:00 2001 From: Gui Chen Date: Fri, 8 Jun 2012 16:59:11 +0800 Subject: [PATCH] remove prefix for make install and typo fix setup.py will auto-detect prefix, 'make install' should not disturb it Signed-off-by: Gui Chen --- Makefile | 5 +---- mic/utils/rpmmisc.py | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index cf34fc8..5165fd2 100644 --- a/Makefile +++ b/Makefile @@ -10,9 +10,6 @@ else TAG = "HEAD" endif -ifndef PREFIX - PREFIX = $(shell $(PYTHON) -c "import sys;print sys.prefix") -endif all: build @@ -37,7 +34,7 @@ man: USAGE.rst rst2man $< >mic.1 install: build - $(PYTHON) setup.py install --prefix=$(DESTDIR)/$(PREFIX) + $(PYTHON) setup.py install develop: build $(PYTHON) setup.py develop diff --git a/mic/utils/rpmmisc.py b/mic/utils/rpmmisc.py index e0af019..581fd2c 100644 --- a/mic/utils/rpmmisc.py +++ b/mic/utils/rpmmisc.py @@ -27,7 +27,7 @@ import runner from urlgrabber import grabber, __version__ as grabber_version if rpm.labelCompare(grabber_version.split('.'), '3.9.0'.split('.')) == -1: msger.warning("Version of python-urlgrabber is %s, lower than '3.9.0', " - "you may encounter some network issues" % grbber_version) + "you may encounter some network issues" % grabber_version) def myurlgrab(url, filename, proxies, progress_obj = None): g = grabber.URLGrabber() -- 2.7.4