diff options
| author | Karel Zak | 2013-09-27 14:06:14 +0200 |
|---|---|---|
| committer | Karel Zak | 2013-09-27 14:23:38 +0200 |
| commit | 6073251ca88c7f17366ea409c4a947dd9e98cdcf (patch) | |
| tree | f59d9c0ba03104609b0986d180ea0f7848a4b096 | |
| parent | build-sys: fix lastb symlink (diff) | |
| download | kernel-qcow2-util-linux-6073251ca88c7f17366ea409c4a947dd9e98cdcf.tar.gz kernel-qcow2-util-linux-6073251ca88c7f17366ea409c4a947dd9e98cdcf.tar.xz kernel-qcow2-util-linux-6073251ca88c7f17366ea409c4a947dd9e98cdcf.zip | |
build-sys: one install dir for all pylibmount stuff
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | libmount/python/Makemodule.am | 10 |
3 files changed, 10 insertions, 5 deletions
@@ -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 79d11da93..dc8cb0fb6 100644 --- 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 cc36f8958..7f286dbfb 100644 --- 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 \ |