don't include buildroot in executables path

[mapleoin]

Hi!

With the current version of calibre, the template for all the binary files in /usr/bin outputs this line:

sys.executables_location = os.environ.get('CALIBRE_EXECUTABLES_PATH', '/home/mapleoin/rpmbuild/BUILDROOT/calibre-0.6.32-1.fc12.x86_64/usr/bin')

Including the full staging_bindir in that path is obviously bad.

This patch seems to fix it:

diff -up calibre/setup/install.py.executables calibre/setup/install.py
--- calibre/setup/install.py.executables	2010-01-06 11:12:45.214637969 +0200
+++ calibre/setup/install.py	2010-01-06 11:12:58.056763017 +0200
@@ -185,7 +185,7 @@ class Develop(Command):
         script = template.format(
                 module=mod, func=func,
                 path=self.libdir, resources=self.sharedir,
-                executables=self.staging_bindir,
+                executables=self.bindir,
                 extensions=self.j(self.libdir, 'calibre', 'plugins'))
         path = self.j(self.staging_bindir, name)
         if not os.path.exists(self.staging_bindir):

[john]

This is required for running against a development install where the scripts call a local copy of the source.

[john]

My mistake, I was thinking of a different component that does similar. Reopening, so Kovid can take a look at it.

[kovidgoyal]

@john: IIRC staging_bindir is not available as a customizable option in the develop command. It gets setup to <prefix>/bin (which is what bindir gets set to as well, so this patch should be fine). I'm applying the patch, re-open this ticket if you disagree.