Pass correct -rpath to libtool when build with --root

Signed-off-by: Alexander Golubev <fatzer2@gmail.com>

1 files changed, 10 insertions, 12 deletions

diff --git a/setup.py b/setup.py
index 8690ffa..edd93c2 100755
--- a/setup.py
+++ b/setup.py
@@ -56,18 +56,20 @@ class InstallPyKDEExtensions(tdedistutils.InstallKDE):
             
     def initialize_options(self):
         self.install_clib = None
+        self.tde_libdir = None
         self.install_cheaders = None
         tdedistutils.InstallKDE.initialize_options(self)
 
     def finalize_options(self):
+        if self.tde_libdir is None:
+            self.announce("Detecting KDE library directory...")
+            self.tde_libdir = tdedistutils.ask_kde_config('--install lib --expandvars').strip()
+            self.announce("  ...KDE library directory is %s" % self.tde_libdir)
         if self.install_clib is None:
             if self.prefix is not None:
                 self.install_clib = os.path.join(self.prefix,'lib')
             else:
-                self.announce("Detecting KDE library directory...")
-                self.install_clib = tdedistutils.ask_kde_config('--install lib --expandvars').strip()
-                self.announce("  ...KDE library directory is %s" % self.install_clib)
-                
+                self.install_clib = self.tde_libdir
         if self.install_cheaders is None:
             if self.prefix is not None:
                 self.install_cheaders = os.path.join(self.prefix,'include')
@@ -86,7 +88,7 @@ class BuildLibpythonize(Command):
     description = "Build libpythonize"
 
     user_options = [
-                    ('install-dir=', 'd',"Directory for the libpythonize shared library."),
+                    ('tde-rpath=', 'd',"Rpath that will be added to C libraries."),
                     ('no-libpythonize',None,"Don't build libpythonize"),
                     ('build-dir=','b', "build directory (where to install from)"),
                     ('python-dir=',None,'Directory containing the Python installation'),
@@ -96,7 +98,7 @@ class BuildLibpythonize(Command):
     
     def initialize_options(self):
         self.build_dir = None
-        self.install_dir = None
+        self.tde_rpath = None
         self.no_libpythonize = 0
         self.python_inc_dir = None
         self.python_dir = None
@@ -104,15 +106,11 @@ class BuildLibpythonize(Command):
         
     def finalize_options(self):
         if self.no_libpythonize==0:
-            own_install_dir = self.install_dir is not None
 
             self.set_undefined_options('install',\
                                 ('build_base', 'build_dir'),
-                                ('install_clib', 'install_dir') )
+                                ('tde_libdir', 'tde_rpath') )
 
-            install = self.get_finalized_command('install')
-            self.install_prefix = install.prefix
-                    
             # Python dir
             if self.python_dir is None:
                 self.python_dir = os.path.split(sysconfig.get_config_var("LIBPL"))[0]
@@ -216,7 +214,7 @@ class BuildLibpythonize(Command):
         cmdlist.append("-export-dynamic")
         # object
         cmdlist.append(outputfile)
-        cmdlist.append("-rpath"); cmdlist.append(self.install_dir)
+        cmdlist.append("-rpath"); cmdlist.append(self.tde_rpath)
         cmdlist.append("-o"); cmdlist.append(os.path.join(self.build_dir,'libpythonize.la'))
         # Link libs
         linklist = []