]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
build-sys: install to the correct python dirs
authorKarel Zak <kzak@redhat.com>
Thu, 26 Sep 2013 10:55:30 +0000 (12:55 +0200)
committerKarel Zak <kzak@redhat.com>
Thu, 26 Sep 2013 10:55:30 +0000 (12:55 +0200)
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>
configure.ac
libmount/python/Makemodule.am

index 85faa2e0730558b64dee28bd49e32483c4b0e94d..18664b97768e65bcf4e0b2399a5fbfd0a72a3424 100644 (file)
@@ -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],
index 657cdcb2cb72b2ad110bf8913f9af49b8b28dc0d..742d4c536456eccd7b2d9937b60cf763c964b04c 100644 (file)
@@ -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 \