calibre-prefix.patch

   1 --- calibre/setup/install.py~   2010-05-16 05:55:33.000000000 +0200
   2 +++ calibre/setup/install.py    2010-05-20 12:00:42.483014835 +0200
   3 @@ -91,15 +91,10 @@
   4              self.sharedir = self.j(opts.prefix, 'share')
   5          if not getattr(opts, 'staging_root', None):
   6              opts.staging_root = opts.prefix
   7 -        self.staging_libdir = getattr(opts, 'staging_libdir', None)
   8 -        if self.staging_libdir is None:
   9 -            self.staging_libdir = opts.staging_libdir = self.j(opts.staging_root, 'lib')
  10 -        self.staging_bindir = getattr(opts, 'staging_bindir', None)
  11 -        if self.staging_bindir is None:
  12 -            self.staging_bindir = opts.staging_bindir = self.j(opts.staging_root, 'bin')
  13 -        self.staging_sharedir = getattr(opts, 'staging_sharedir', None)
  14 -        if self.staging_sharedir is None:
  15 -            self.staging_sharedir = opts.staging_sharedir = self.j(opts.staging_root, 'share')
  16 +
  17 +        self.staging_libdir = opts.staging_libdir = opts.staging_root + self.libdir
  18 +        self.staging_bindir = opts.staging_bindir = self.j(opts.staging_root, 'usr/', 'bin')
  19 +        self.staging_sharedir = opts.staging_sharedir = self.j(opts.staging_root, 'usr/', 'share')
  20
  21          self.staging_libdir = opts.staging_libdir = self.j(self.staging_libdir, 'calibre')
  22          self.staging_sharedir = opts.staging_sharedir = self.j(self.staging_sharedir, 'calibre')
  23 --- calibre-3.44.0/src/calibre/linux.py~        2019-06-09 19:23:04.000000000 +0200
  24 +++ calibre-3.44.0/src/calibre/linux.py 2019-06-09 19:27:46.476130247 +0200
  25 @@ -685,10 +685,10 @@
  26              self.warn = self.warning
  27
  28          if not self.opts.staging_bindir:
  29 -            self.opts.staging_bindir = os.path.join(self.opts.staging_root,
  30 +            self.opts.staging_bindir = os.path.join(self.opts.staging_root, 'usr',
  31              'bin')
  32          if not self.opts.staging_sharedir:
  33 -            self.opts.staging_sharedir = os.path.join(self.opts.staging_root,
  34 +            self.opts.staging_sharedir = os.path.join(self.opts.staging_root, 'usr',
  35              'share', 'calibre')
  36          self.opts.staging_etc = '/etc' if self.opts.staging_root == '/usr' else \
  37                  os.path.join(self.opts.staging_root, 'etc')
  38 @@ -696,7 +696,7 @@
  39          prefix = getattr(self.opts, 'prefix', None)
  40          if prefix and prefix != self.opts.staging_root:
  41              self.opts.staged_install = True
  42 -            os.environ['XDG_DATA_DIRS'] = os.path.join(self.opts.staging_root, 'share')
  43 +            os.environ['XDG_DATA_DIRS'] = os.path.join(self.opts.staging_root, 'usr', 'share')
  44              os.environ['XDG_UTILS_INSTALL_MODE'] = 'system'
  45
  46          from calibre.utils.serialize import msgpack_loads