diff options
| author | Filipe Brandenburger | 2016-02-05 19:08:50 +0100 |
|---|---|---|
| committer | Filipe Brandenburger | 2016-02-05 19:08:50 +0100 |
| commit | d54eb46646213d99d3ce74a89b3c55f2be061b4d (patch) | |
| tree | 0800daa496a39660358b6b4b24eefd9ff8d56346 /libmount/python | |
| parent | Merge branch 'master' of https://github.com/rudimeier/util-linux (diff) | |
| download | kernel-qcow2-util-linux-d54eb46646213d99d3ce74a89b3c55f2be061b4d.tar.gz kernel-qcow2-util-linux-d54eb46646213d99d3ce74a89b3c55f2be061b4d.tar.xz kernel-qcow2-util-linux-d54eb46646213d99d3ce74a89b3c55f2be061b4d.zip | |
Revert "build-sys: Order pylibmount after usrlib on install"
This reverts commit e61f406913fb9356aed013da7ece34e73929cff6.
Diffstat (limited to 'libmount/python')
| -rw-r--r-- | libmount/python/Makemodule.am | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/libmount/python/Makemodule.am b/libmount/python/Makemodule.am index 89f756f6c..367d32472 100644 --- a/libmount/python/Makemodule.am +++ b/libmount/python/Makemodule.am @@ -2,21 +2,11 @@ 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. -zz_pylibmountexec_LTLIBRARIES = pylibmount.la -zz_pylibmountexec_PYTHON = libmount/python/__init__.py +pylibmountexec_LTLIBRARIES = pylibmount.la +pylibmountexec_PYTHON = libmount/python/__init__.py pylibmount_la_SOURCES = \ libmount/python/pylibmount.c \ |