The patch which I used a long time until calibre stopped shipping man pages

1 files changed, 6 insertions, 6 deletions

diff --git a/calibre/build/calibre.manpages.diff b/calibre/build/calibre.manpages.diff
index 09dbd746..b70960ed 100644
--- a/calibre/build/calibre.manpages.diff
+++ b/calibre/build/calibre.manpages.diff
@@ -5,8 +5,8 @@ diff -up calibre/src/calibre/linux.py.manpages calibre/src/calibre/linux.py
                      continue
                  parser = parser()
                  raw = create_man_page(prog, parser)
--                if isfreebsd:
-+                if isfreebsd or islinux:
+-                if isbsd:
++                if isbsd or islinux:
                      manfile = os.path.join(manpath, prog+'.1')
                  else:
                      manfile = os.path.join(manpath, prog+'.1'+__appname__+'.bz2')
@@ -17,8 +17,8 @@ diff -up calibre/src/calibre/utils/help2man.py.manpages calibre/src/calibre/util
  __docformat__ = 'restructuredtext en'
 
  import time, bz2
--from calibre.constants import isfreebsd
-+from calibre.constants import isfreebsd, islinux
+-from calibre.constants import isbsd
++from calibre.constants import isbsd, islinux
 
  from calibre.constants import __version__, __appname__, __author__
 
@@ -26,10 +26,10 @@ diff -up calibre/src/calibre/utils/help2man.py.manpages calibre/src/calibre/util
      lines = [x if isinstance(x, unicode) else unicode(x, 'utf-8', 'replace') for
              x in lines]
 
--    if not isfreebsd:
+-    if not isbsd:
 -        return  bz2.compress((u'\n'.join(lines)).encode('utf-8'))
 -    else:
-+    if isfreebsd or islinux:
++    if isbsd or islinux:
          return  (u'\n'.join(lines)).encode('utf-8')
 -
 -