From a70c0815ef9e15aaaa83c065ae0c5d1c26250672 Mon Sep 17 00:00:00 2001 From: oetiker Date: Wed, 9 May 2007 15:26:57 +0000 Subject: [PATCH] make sure the python extension gets the final resting place of the rrdlibrary compiled in ... git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2/program@1057 a5681a0c-68f1-0310-ab6d-d61299d08faa --- bindings/Makefile.am | 4 ++-- bindings/python/setup.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bindings/Makefile.am b/bindings/Makefile.am index 76d587c..66e8479 100644 --- a/bindings/Makefile.am +++ b/bindings/Makefile.am @@ -20,7 +20,7 @@ install-data-local: test -f perl-piped/Makefile && cd perl-piped && $(MAKE) install || true test -f perl-shared/Makefile && cd perl-shared && $(MAKE) install || true test -f ruby/Makefile && cd ruby && $(MAKE) EPREFIX=$(exec_prefix) $(RUBY_MAKE_OPTIONS) install || true - test -d python/build && cd python && env LIBDIR=$(libdir) $(PYTHON) setup.py install --skip-build --prefix=$(DESTDIR)$(prefix) --exec-prefix=$(DESTDIR)$(exec_prefix) || true + test -d python/build && cd python && env BUILDLIBDIR=../../src/.libs RUNTIMELIBDIR=$(exec_prefix)/lib $(PYTHON) setup.py install --skip-build --prefix=$(DESTDIR)$(prefix) --exec-prefix=$(DESTDIR)$(exec_prefix) || true # rules for buildung the ruby module # RUBYARCHDIR= is to work around in a makefile quirk not sure @@ -30,7 +30,7 @@ ruby: # rules for buildung the pyton module python: - cd python && env LIBDIR=../../src/.libs $(PYTHON) setup.py build + cd python && env BUILDLIBDIR=../../src/.libs RUNTIMELIBDIR=$(exec_prefix)/lib $(PYTHON) setup.py build # rules for building the perl module perl_piped: perl-piped/Makefile diff --git a/bindings/python/setup.py b/bindings/python/setup.py index 7912d92..3fc46ab 100644 --- a/bindings/python/setup.py +++ b/bindings/python/setup.py @@ -32,7 +32,8 @@ from distutils.core import setup, Extension import sys, os RRDBASE = os.environ.get('LOCALBASE', '../../src') -library_dir = os.environ.get('LIBDIR', os.path.join(RRDBASE, 'lib')) +runtime_library_dir = os.environ.get('RUNTIMELIBDIR') +library_dir = os.environ.get('BUILDLIBDIR', os.path.join(RRDBASE, 'lib')) include_dir = os.environ.get('INCDIR', RRDBASE) setup(name = "py-rrdtool", @@ -48,7 +49,7 @@ setup(name = "py-rrdtool", "rrdtoolmodule", ["rrdtoolmodule.c"], libraries=['rrd'], - runtime_library_dirs=[library_dir], + runtime_library_dirs=[runtime_library_dir], library_dirs=[library_dir], include_dirs=[include_dir], ) -- 2.11.0