diff options
| author | Karel Zak | 2016-01-27 13:00:13 +0100 |
|---|---|---|
| committer | Karel Zak | 2016-01-27 13:00:13 +0100 |
| commit | 4c01c98ca20b404940a4be749e729411d861ae97 (patch) | |
| tree | 1ac3df249281a07aea8dec765eccd469cadf4f07 /libmount | |
| parent | Merge branch 'fix-static-configuration-and-building' of https://github.com/la... (diff) | |
| parent | build-sys: Order pylibmount after usrlib on install (diff) | |
| download | kernel-qcow2-util-linux-4c01c98ca20b404940a4be749e729411d861ae97.tar.gz kernel-qcow2-util-linux-4c01c98ca20b404940a4be749e729411d861ae97.tar.xz kernel-qcow2-util-linux-4c01c98ca20b404940a4be749e729411d861ae97.zip | |
Merge branch 'fix_pylibmount_install' of https://github.com/filbranden/util-linux
* 'fix_pylibmount_install' of https://github.com/filbranden/util-linux:
build-sys: Order pylibmount after usrlib on install
Diffstat (limited to 'libmount')
| -rw-r--r-- | libmount/python/Makemodule.am | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/libmount/python/Makemodule.am b/libmount/python/Makemodule.am index 367d32472..89f756f6c 100644 --- a/libmount/python/Makemodule.am +++ b/libmount/python/Makemodule.am @@ -2,11 +2,21 @@ if BUILD_PYLIBMOUNT pylibmountexecdir = $(pyexecdir)/libmount +# Use a zz_ prefix to ensure this is last on `make install` (automake orders +# the entries in alphabetical order) since we need to ensure that the +# install-zz_pylibmountexecLTLIBRARIES step is only executed after the +# install-usrlib_execLTLIBRARIES step, otherwise libtool fails to find +# libmount under DESTDIR when it tries to relink pylibmount.so. +# +# Keep the pylibmountexecdir variable, in order to be backwards compatible with +# invocation of `make install` that override that variable in the command line. +zz_pylibmountexecdir = $(pylibmountexecdir) + # 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_PYTHON = libmount/python/__init__.py +zz_pylibmountexec_LTLIBRARIES = pylibmount.la +zz_pylibmountexec_PYTHON = libmount/python/__init__.py pylibmount_la_SOURCES = \ libmount/python/pylibmount.c \ |