]>
Commit | Line | Data |
---|---|---|
a590ca1e | 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 | + | |
9c8cebf1 | 17 | + self.staging_libdir = opts.staging_libdir = opts.staging_root + self.libdir |
a590ca1e | 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') |