commit 67e013d14c66b026361f434dd8344917e7c24d40 Author: Damian Johnson <atagar@torproject.org> Date: Tue Jun 9 09:40:18 2015 -0700 Don't install a man page or sample script by default We added '--man-page' and '--sample-path' arguments to our setup.py. It's a bit more intuitive if we don't install these resources unless the user opts-in since they don't respect --prefix, --user, and other such arguments... https://trac.torproject.org/projects/tor/ticket/16317 --- setup.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index d780228..103b674 100644 --- a/setup.py +++ b/setup.py @@ -14,9 +14,6 @@ from distutils import log from distutils.core import setup from distutils.command.install import install -DEFAULT_MAN_PAGE_PATH = '/usr/share/man/man1/nyx.1.gz' -DEFAULT_SAMPLE_PATH = '/usr/share/doc/nyx/nyxrc.sample' - class NyxInstaller(install): """ @@ -34,14 +31,14 @@ class NyxInstaller(install): """ user_options = install.user_options + [ - ('man-page=', None, 'man page location (default: %s)' % DEFAULT_MAN_PAGE_PATH), - ('sample-path=', None, 'example nyxrc location (default: %s)' % DEFAULT_SAMPLE_PATH), + ('man-page=', None, 'man page location'), + ('sample-path=', None, 'example nyxrc location'), ] def initialize_options(self): install.initialize_options(self) - self.man_page = DEFAULT_MAN_PAGE_PATH - self.sample_path = DEFAULT_SAMPLE_PATH + self.man_page = None + self.sample_path = None def run(self): install.run(self)