build-sys: one install dir for all pylibmount stuff

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

diff --git a/NEWS b/NEWS
index addbb82c592e486d97cf5adca8b49ccedf551c8f..f5dc54cf3f01098c5fe3d41a86b1226a18aa314a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+util-linux 2.24-rc1: Sep 27 2013
+* see Documentation/releases/v2.24-ReleaseNotes or complete changelog at
+  ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.24/v2.24-rc1-ChangeLog
+
 util-linux 2.23: Apr 25 2013
 * see Documentation/releases/v2.23-ReleaseNotes or complete changelog at
   ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.23/v2.23-ChangeLog

diff --git a/configure.ac b/configure.ac
index 79d11da93c7baa9b99cdfe0e1399cbf67b00d615..dc8cb0fb646629608d12bf6f5d2989e2cfe179f5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1542,7 +1542,6 @@ AC_MSG_RESULT([
        suid ldflags:      ${SUID_LDFLAGS}
 
        Python:            ${PYTHON_VERSION}
-       Python scripts:    ${pythondir}
        Python libs:       ${pyexecdir}
 
        Bash completions:  ${with_bashcompletiondir}

diff --git a/libmount/python/Makemodule.am b/libmount/python/Makemodule.am
index cc36f895858346c5c0d2bec08d6fb6bd6758852d..7f286dbfb2f9eb1a1dd05fe7a492a29e837b9eca 100644 (file)
--- a/libmount/python/Makemodule.am
+++ b/libmount/python/Makemodule.am
@@ -2,12 +2,14 @@
 if BUILD_PYLIBMOUNT
 
 pylibmountexecdir = $(pyexecdir)/libmount
-pylibmountexec_LTLIBRARIES = pylibmount.la
 
-pythonlibmountdir = $(pythondir)/libmount
-pythonlibmount_SCRIPTS = libmount/python/libmount/__init__.py
+# Please, don't use $pythondir for the scripts. We have to use the same
+# directory for binary stuff as well as for the scripts otherwise it's
+# not possible to install 32-bit and 64-bit version on the same system.
+pylibmountexec_LTLIBRARIES = pylibmount.la
+pylibmountexec_SCRIPTS = libmount/python/libmount/__init__.py
 
-EXTRA_DIST += $(pythonlibmount_SCRIPTS)
+EXTRA_DIST += $(pylibmountexec_SCRIPTS)
 
 pylibmount_la_SOURCES = \
        libmount/python/pylibmount.c \