diff --git a/overviewer.py b/overviewer.py index 55400ce..f714e62 100755 --- a/overviewer.py +++ b/overviewer.py @@ -106,9 +106,9 @@ def main(): if options.genpoi: # remove the "--genpoi" option from sys.argv before running genPI sys.argv.remove("--genpoi") - sys.path.append(".") - g = __import__("genPOI", {}, {}) - g.main() + #sys.path.append(".") + g = __import__("overviewer_core.aux_files", {}, {}, ["genPOI"]) + g.genPOI.main() return 0 if options.help: parser.print_help() diff --git a/overviewer_core/aux_files/__init__.py b/overviewer_core/aux_files/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/genPOI.py b/overviewer_core/aux_files/genPOI.py similarity index 100% rename from genPOI.py rename to overviewer_core/aux_files/genPOI.py diff --git a/setup.py b/setup.py index 583358c..2e20f66 100755 --- a/setup.py +++ b/setup.py @@ -108,7 +108,6 @@ if py2exe is not None: setup_kwargs['data_files'] += recursive_data_files('overviewer_core/data/web_assets', 'web_assets') setup_kwargs['data_files'] += recursive_data_files('overviewer_core/data/js_src', 'js_src') setup_kwargs['data_files'] += recursive_data_files('contrib', 'contrib') - setup_kwargs['data_files'] += [('', ['genPOI.py'])] setup_kwargs['zipfile'] = None if platform.system() == 'Windows' and '64bit' in platform.architecture(): b = 3 @@ -129,7 +128,7 @@ if py2app is not None: # script, package, and data # -setup_kwargs['packages'] = ['overviewer_core'] +setup_kwargs['packages'] = ['overviewer_core', 'overviewer_core/aux_files'] setup_kwargs['scripts'] = ['overviewer.py'] setup_kwargs['package_data'] = {'overviewer_core': recursive_package_data('data/textures') + recursive_package_data('data/web_assets') + recursive_package_data('data/js_src')}