diff options
| author | Christian Heimes <cheimes@redhat.com> | 2017-03-15 10:46:36 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2017-03-15 13:48:23 +0100 |
| commit | b280c7bb0192485dfb622c731e31deb89d517b6f (patch) | |
| tree | f96981d9b6e5f613a3f3b50e23f1f91a16038773 | |
| parent | f1f63506caf88e4d86ea2bfdc7d25eceaf689bc5 (diff) | |
| download | freeipa-b280c7bb0192485dfb622c731e31deb89d517b6f.tar.gz freeipa-b280c7bb0192485dfb622c731e31deb89d517b6f.tar.xz freeipa-b280c7bb0192485dfb622c731e31deb89d517b6f.zip | |
Add PYTHON_INSTALL_EXTRA_OPTIONS and --install-layout=deb
Debian packages should be installed under dist-packages, not
site-packages. Debian has patched distutils and setuptools to add a new
flag '--install-layout'. For --with-ipaplatform=debian,
PYTHON_INSTALL_EXTRA_OPTIONS is set to '--install-layout=deb'.
https://pagure.io/freeipa/issue/6764
Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Timo Aaltonen <tjaalton@debian.org>
Reviewed-By: Martin Basti <mbasti@redhat.com>
| -rw-r--r-- | Makefile.python.am | 3 | ||||
| -rw-r--r-- | configure.ac | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/Makefile.python.am b/Makefile.python.am index f158ff5df..7d30ff19c 100644 --- a/Makefile.python.am +++ b/Makefile.python.am @@ -28,7 +28,8 @@ install-exec-local: $(top_builddir)/ipasetup.py --prefix "$(DESTDIR)$(prefix)" \ --single-version-externally-managed \ --record "$(DESTDIR)$(pkgpythondir)/install_files.txt" \ - --optimize 1; \ + --optimize 1 \ + $(PYTHON_INSTALL_EXTRA_OPTIONS); \ fi uninstall-local: diff --git a/configure.ac b/configure.ac index 4d7a8469a..81f74f1e9 100644 --- a/configure.ac +++ b/configure.ac @@ -290,6 +290,14 @@ fi AC_SUBST([IPAPLATFORM]) AC_MSG_RESULT([${IPAPLATFORM}]) +if test "x${IPAPLATFORM}" == "xdebian"; then + # see https://www.debian.org/doc/packaging-manuals/python-policy/ap-packaging_tools.html + PYTHON_INSTALL_EXTRA_OPTIONS="--install-layout=deb" +else + PYTHON_INSTALL_EXTRA_OPTIONS="" +fi +AC_SUBST([PYTHON_INSTALL_EXTRA_OPTIONS]) +AC_MSG_RESULT([python setup.py install extra options ${PYTHON_INSTALL_EXTRA_OPTIONS}]) dnl --------------------------------------------------------------------------- dnl Version information from VERSION.m4 and command line |