patch-setup_py 1.3 KB

1234567891011121314151617181920212223242526272829303132333435
  1. $OpenBSD: patch-setup_py,v 1.4 2015/05/04 19:28:16 benno Exp $
  2. --- setup.py.orig Wed Aug 20 15:35:11 2014
  3. +++ setup.py Sun Apr 26 17:07:46 2015
  4. @@ -81,7 +81,7 @@ def include_file(file):
  5. def collect_data_files():
  6. # Search for data files to be installed in share/
  7. data_files = [
  8. - ('share/man/man1', ['man/zim.1']),
  9. + ('man/man1', ['man/zim.1']),
  10. ('share/applications', ['xdg/zim.desktop']),
  11. ('share/mime/packages', ['xdg/zim.xml']),
  12. ('share/pixmaps', ['xdg/hicolor/48x48/apps/zim.png']),
  13. @@ -111,6 +111,12 @@ def collect_data_files():
  14. files = [os.path.join(dir, f) for f in files]
  15. data_files.append((target, files))
  16. + for dir, dirs, files in os.walk('man'):
  17. + if files:
  18. + target = os.path.join('man', dir[4:])
  19. + files = [os.path.join(dir, f) for f in files]
  20. + data_files.append((target, files))
  21. +
  22. if build_target == 'maemo':
  23. # Remove default .desktop files and replace with our set
  24. prefix = os.path.join('share', 'zim', 'applications')
  25. @@ -276,7 +282,7 @@ class zim_install_class(install_class):
  26. def initialize_options(self):
  27. install_class.initialize_options(self)
  28. - self.skip_xdg_cmd = 0
  29. + self.skip_xdg_cmd = 1
  30. def run(self):
  31. install_class.run(self)