diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2014-01-19 16:06:03 +1300 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2014-01-19 16:06:03 +1300 |
commit | f431eb5accb03a2e97109e4b12b880827fd8306e (patch) | |
tree | b62ae3d2fe61503be650a3540a89aa081d3bd8b0 | |
parent | 64be9b1a8a695f253dfcf2188ce303791d451bfa (diff) | |
download | mitmproxy-f431eb5accb03a2e97109e4b12b880827fd8306e.tar.gz mitmproxy-f431eb5accb03a2e97109e4b12b880827fd8306e.tar.bz2 mitmproxy-f431eb5accb03a2e97109e4b12b880827fd8306e.zip |
Tweak setup.py to allow installs outside source dir
Also fix mitmdump version output
-rwxr-xr-x | mitmdump | 2 | ||||
-rw-r--r-- | setup.py | 8 |
2 files changed, 8 insertions, 2 deletions
@@ -5,7 +5,7 @@ import argparse if __name__ == '__main__': parser = argparse.ArgumentParser(usage = "%(prog)s [options] [filter]") - parser.add_argument('--version', action='version', version=version.NAMEVERSION) + parser.add_argument('--version', action='version', version="mitmdump" + " " + version.VERSION) cmdline.common_options(parser) parser.add_argument( "--keepserving", @@ -2,6 +2,12 @@ from distutils.core import setup import fnmatch, os.path from libmproxy import version + +def pdir(): + dirname, _ = os.path.split(__file__) + return os.path.abspath(dirname) + + def _fnmatch(name, patternList): for i in patternList: if fnmatch.fnmatch(name, i): @@ -65,7 +71,7 @@ def findPackages(path, dataExclude=[]): return packages, package_data -long_description = file("README.txt").read() +long_description = file(os.path.join(pdir(), "README.txt")).read() packages, package_data = findPackages("libmproxy") setup( name = "mitmproxy", |