From 050f8ca176169e5757fc7d6d03f2add7ce823448 Mon Sep 17 00:00:00 2001 From: oetiker Date: Tue, 15 May 2007 08:36:52 +0000 Subject: [PATCH] yet another attempt to make the python build environment REALY cool git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.2/program@1059 a5681a0c-68f1-0310-ab6d-d61299d08faa --- bindings/Makefile.am | 4 ++-- bindings/python/setup.py | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/bindings/Makefile.am b/bindings/Makefile.am index 66e8479..c0ad1d6 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 BUILDLIBDIR=../../src/.libs RUNTIMELIBDIR=$(exec_prefix)/lib $(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 $(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 BUILDLIBDIR=../../src/.libs RUNTIMELIBDIR=$(exec_prefix)/lib $(PYTHON) setup.py build + cd python && env BUILDLIBDIR=../../src/.libs $(PYTHON) setup.py build_ext --rpath=$(exec_prefix)/lib && env LIBDIR=../../src/.libs $(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 3fc46ab..7a41a11 100644 --- a/bindings/python/setup.py +++ b/bindings/python/setup.py @@ -32,7 +32,6 @@ from distutils.core import setup, Extension import sys, os RRDBASE = os.environ.get('LOCALBASE', '../../src') -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) @@ -49,7 +48,6 @@ setup(name = "py-rrdtool", "rrdtoolmodule", ["rrdtoolmodule.c"], libraries=['rrd'], - runtime_library_dirs=[runtime_library_dir], library_dirs=[library_dir], include_dirs=[include_dir], ) -- 2.11.0