From c2337d9597c6b73a61c3dbb6328d1e4c9294ce45 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Wed, 18 Jun 2014 15:42:07 -0500 Subject: [PATCH] Fix location of custom Python bindings. I have a small patch to correct the install location of the python bindings. Since it's not a pure python extension is belongs in pyexecdir instead of pythondir, which for multilib systems like Fedora will get installed into /usr/lib64/python{ver}/site-packages on 64bit systems. This is consistent with the automake documentation: http://www.gnu.org/software/automake/manual/html_node/Python.html (Patch adjusted by n0nb for Hamlib 3.0 bindings/Makefile.am) Signed-off-by: Nate Bargmann --- bindings/Makefile.am | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/bindings/Makefile.am b/bindings/Makefile.am index 0c7c15868..8dd02f025 100644 --- a/bindings/Makefile.am +++ b/bindings/Makefile.am @@ -78,22 +78,20 @@ if ENABLE_PYTHON ########################################## # Python binding -python_ltlib = _Hamlib.la - -#pythondir = @pythondir@ +pyexec_ltlib = _Hamlib.la MOSTLYCLEANFILES+= hamlibpy_wrap.c Hamlib.py *.pyc BUILT_SOURCES += hamlibpy_wrap.c Hamlib.py -nodist_python_PYTHON = Hamlib.py +nodist_pyexec_PYTHON = Hamlib.py nodist__Hamlib_la_SOURCES = hamlibpy_wrap.c _Hamlib_la_LDFLAGS = -no-undefined -module -avoid-version _Hamlib_la_LIBADD = $(top_builddir)/src/libhamlib.la -_Hamlib_ladir = $(pythondir) -_Hamlib_la_LTLIBRARIES = $(python_ltlib) +_Hamlib_ladir = $(pyexecdir) +_Hamlib_la_LTLIBRARIES = $(pyexec_ltlib) -all-py: $(python_ltlib) +all-py: $(pyexec_ltlib) check-py: all-py $(srcdir)/pytest.py || echo "Python test failed" 1>&2