[Skencil-commits] r522 - skencil/branches/skencil-0.6

[scm-commit@wald.intevation.org]

Author: bh
Date: 2006-02-12 00:55:50 +0100 (Sun, 12 Feb 2006)
New Revision: 522

Modified:
   skencil/branches/skencil-0.6/ChangeLog
   skencil/branches/skencil-0.6/setup.py
Log:
Make it easier for packagers to customize where Skencil installs
files.

* setup.py (InstallDirs.__init__): Set self.library from the
--libdir option
(parse_cmd_line): New option for the install command, --libdir to
specify the name of the directory where Skencil's library files
are installed.  Default is $PREFIX/lib/skencil-<version>/.


Modified: skencil/branches/skencil-0.6/ChangeLog
===================================================================
--- skencil/branches/skencil-0.6/ChangeLog	2006-02-11 23:30:57 UTC (rev 521)
+++ skencil/branches/skencil-0.6/ChangeLog	2006-02-11 23:55:50 UTC (rev 522)
@@ -1,5 +1,16 @@
 2006-02-12  Bernhard Herzog  <bh at intevation.de>
 
+	Make it easier for packagers to customize where Skencil installs
+	files.
+
+	* setup.py (InstallDirs.__init__): Set self.library from the
+	--libdir option
+	(parse_cmd_line): New option for the install command, --libdir to
+	specify the name of the directory where Skencil's library files
+	are installed.  Default is $PREFIX/lib/skencil-<version>/.
+
+2006-02-12  Bernhard Herzog  <bh at intevation.de>
+
 	* po/de.po: Fix some typos.  Patch from the debian project.
 
 2006-01-29  Bernhard Herzog  <bh at intevation.de>

Modified: skencil/branches/skencil-0.6/setup.py
===================================================================
--- skencil/branches/skencil-0.6/setup.py	2006-02-11 23:30:57 UTC (rev 521)
+++ skencil/branches/skencil-0.6/setup.py	2006-02-11 23:55:50 UTC (rev 522)
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 
 # Skencil - A Python-based interactive drawing program
-# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005 by Bernhard Herzog
+# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006 by Bernhard Herzog
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
@@ -406,12 +406,12 @@
     prefix = ''
     exec_prefix = ''
     executable = ''
-    library = ''
     destdir = ''
 
     def __init__(self, flags):
         self.prefix = flags['standard']['prefix']
         self.destdir = flags['standard']['destdir']
+        self.library = flags['standard']['libdir']
 
     def fix_dirs(self, progname, version):
         # e.g. progname = 'skencil', version = '0.5.3'
@@ -590,7 +590,8 @@
     setup = None
     argv = sys.argv[1:]
     flags = {}
-    flags['standard'] = {'prefix': '/usr/local/', 'destdir':''}
+    flags['standard'] = {'prefix': '/usr/local/', 'destdir':'',
+                         'libdir': ''}
     flags['pax'] = {'XSHM': ''}
     flags['intl'] = {'files': ''}
     flags['sketch'] = {'imaging-include':
@@ -617,6 +618,8 @@
             flags['standard']['prefix'] = value
         elif arg == '--dest-dir':
             flags['standard']['destdir'] = value
+        elif arg == '--libdir':
+            flags['standard']['libdir'] = value
         elif arg == '--python-setup':
             setup = value
         elif arg == '--pax-no-xshm':
@@ -683,6 +686,8 @@
                           PREFIX/bin [/usr/local]
   --dest-dir=DIR          If given, install the files under DIR, but pretend
                           that the files are really under the prefix directory.
+  --libdir=DIR            If given, install the library files under DIR,
+                          instead of PREFIX/lib/skencil-%(version)s/
 """