Merge from trunk revs 1671 and 1672: Update project info in

libapparmor's setup.py.in and adjust the python setup to actually match
what swig expects so it will work.

Signed-Off-By: Steve Beattie <sbeattie@ubuntu.com>
This commit is contained in:
Steve Beattie 2011-03-07 08:11:59 -08:00
parent 04b428bc32
commit d8b5dba829

View file

@ -4,14 +4,14 @@ import string
setup(name = 'LibAppArmor', setup(name = 'LibAppArmor',
version = '@VERSION@', version = '@VERSION@',
author = 'AppArmor Dev Team', author = 'AppArmor Dev Team',
author_email = 'Apparmor-dev@forge.novell.com', author_email = 'apparmor@lists.ubuntu.com',
url = 'http://developer.novell.com/wiki/index.php/Apparmor', url = 'http://apparmor.wiki.kernel.org',
description = 'AppArmor python bindings', description = 'AppArmor python bindings',
download_url = 'http://developer.novell.com/wiki/index.php/Special:Downloads/apparmor', download_url = 'https://launchpad.net/apparmor/+download',
package_dir = {'libapparmor1': '@srcdir@'}, package_dir = {'LibAppArmor': '@srcdir@'},
packages = [ 'libapparmor1' ], packages = [ 'LibAppArmor' ],
ext_package = 'libapparmor1', ext_package = 'LibAppArmor',
ext_modules = [Extension('_libapparmor', ['libapparmor_wrap.c'], ext_modules = [Extension('_LibAppArmor', ['libapparmor_wrap.c'],
include_dirs=['@top_srcdir@/src'], include_dirs=['@top_srcdir@/src'],
extra_link_args = string.split('-L@top_builddir@/src/.libs -lapparmor'), extra_link_args = string.split('-L@top_builddir@/src/.libs -lapparmor'),
# static: extra_link_args = string.split('@top_builddir@/src/.libs/libapparmor.a'), # static: extra_link_args = string.split('@top_builddir@/src/.libs/libapparmor.a'),