From: Karel Zak <kzak@redhat.com>
Date: Thu, 26 Sep 2013 10:55:30 +0000 (+0200)
Subject: build-sys: install to the correct python dirs
X-Git-Tag: v2.24-rc1~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=808c876512187d146b3d54e1ee2b74a6520b5216;p=thirdparty%2Futil-linux.git

build-sys: install to the correct python dirs

It seems we have to call AM_PATH_PYTHON() monster to get
pyexec (shared libs) and python (scripts) directories.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/configure.ac b/configure.ac
index 85faa2e073..18664b9776 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1392,8 +1392,7 @@ AS_IF([test "x$with_python" != xno], [
   ])
   PKG_CHECK_MODULES(PYTHON,[${modname} >= $pymajor],
 		           [have_python=yes
-			    PYTHON_VERSION=`$PKG_CONFIG --modversion $modname`
-			    AC_SUBST([PYTHON_VERSION])],
+			    AM_PATH_PYTHON([$pymajor])],
 			   [have_python=no])
   AS_CASE([$with_python:$have_python],
     [yes:no],
diff --git a/libmount/python/Makemodule.am b/libmount/python/Makemodule.am
index 657cdcb2cb..742d4c5364 100644
--- a/libmount/python/Makemodule.am
+++ b/libmount/python/Makemodule.am
@@ -3,7 +3,9 @@ if BUILD_PYLIBMOUNT
 
 pylibmountexecdir = $(pyexecdir)/libmount
 pylibmountexec_LTLIBRARIES = pylibmount.la
-pylibmountexec_SCRIPTS = libmount/python/libmount/__init__.py
+
+pythonlibmountdir = $(pythondir)/libmount
+pythonlibmount_SCRIPTS = libmount/python/libmount/__init__.py
 
 pylibmount_la_SOURCES = \
 	libmount/python/pylibmount.c \