From ddd61f6600dd62d2bd466d17f3d401f7f6ad4793 Mon Sep 17 00:00:00 2001 From: calvin Date: Tue, 10 Oct 2000 16:43:54 +0000 Subject: [PATCH] configuration git-svn-id: https://linkchecker.svn.sourceforge.net/svnroot/linkchecker/trunk/linkchecker@170 e7d03fd6-7b0d-0410-9947-9c21f3af8025 --- INSTALL | 17 ++++++++--------- debian/control | 2 +- setup.py | 7 +++---- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/INSTALL b/INSTALL index 883f3b22..b736e22c 100644 --- a/INSTALL +++ b/INSTALL @@ -4,7 +4,9 @@ Requirements ------------ Python >= 1.5.2 from http://www.python.org/ -Distutils >= 0.9 from http://www.python.org/sigs/distutils-sig/ +Distutils >= 0.9.1 from http://www.python.org/sigs/distutils-sig/ +Python 1.6 includes the Distutils 0.9.1, +Python 2.0 includes the Distutils 1.0 Optionally packages ------------------- @@ -16,18 +18,15 @@ on Windows! Setup ----- -The Distutils package has a lot of install options to tweak and ease -your installation. Type "python setup.py --help" for options. -To install LinkChecker run "python setup.py install". +Run "python setup.py config" to configure. +Run "python setup.py install" to install. +Run "python setup.py --help" for help. Debian users can build the .deb package with "debian/rules binary" as root or "fakeroot debian/rules binary" as a normal user. The system wide configuration file is in /etc/linkcheckerrc. - - -Running the link checker ------------------------- -Type "linkchecker" followed by your URLs you want to check. +To run the program type "linkchecker" followed by your URLs you want +to check. Type "linkchecker -h" for help. diff --git a/debian/control b/debian/control index cd24492e..eeb0aa69 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Bastian Kleineidam Standards-Version: 3.0.1 Package: linkchecker -Architecture: all +Architecture: i386 Depends: python-base (= 1.5.2) Suggests: libssl09|libssl095a Description: check/validate/test your HTML documents for broken links/URLs diff --git a/setup.py b/setup.py index e5e64be5..b24a08d9 100755 --- a/setup.py +++ b/setup.py @@ -73,7 +73,7 @@ class LCConfig(config): data.append("ssl_library_dirs = %s" % `self.ssl_library_dirs`) data.append("ssl_include_dirs = %s" % `self.ssl_include_dirs`) data.append("libraries = %s" % `['ssl', 'crypto']`) - data.append("install_data = ''") + data.append("install_data = %s" % `os.getcwd()`) self.distribution.create_conf_file(".", data) @@ -88,9 +88,8 @@ class LCDistribution(Distribution): def check_ssl(self): if not os.path.exists(self.config_file): - self.announce("WARNING: Configuration file %s not found." - % self.config_file) - return + self.announce("generating default configuration") + self.run_command('config') import LinkCheckerConf if 'bdist_wininst' in self.commands and os.name!='nt': self.announce("bdist_wininst command found on non-Windows "