From: Kees Cook <kees@debian.org>
Date: Wed, 24 Jul 2019 22:12:36 +0000 (+0100)
Subject: python_install_dir
X-Git-Tag: archive/raspbian/2.4.2-2+rpi1~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d3a6fa0eeb1d8d0a9acb23fa8e78703d54ab1a45;p=libseccomp.git

python_install_dir

From 830929096665eab2b910d676ccab1df90908cb02 Mon Sep 17 00:00:00 2001
From: Felix Geyer <debfx@fobos.de>
Date: Mon, 15 Jul 2019 21:12:05 +0200
Subject: [PATCH] Install the python extension to the root package dir

Commit 8ad3638ea9023c3948976dfadebd1554380a31c9 effectively added libseccomp/
to the install path of the python extension.
This changed the import module name from "seccomp" to "libseccomp.seccomp",
breaking existing users.

Revert the install path like it was before 2.4.0

Signed-off-by: Felix Geyer <debfx@fobos.de>

Gbp-Pq: Name python_install_dir.patch
---

diff --git a/src/python/Makefile.am b/src/python/Makefile.am
index 3a34b0a..f71ec24 100644
--- a/src/python/Makefile.am
+++ b/src/python/Makefile.am
@@ -40,12 +40,12 @@ build: ../libseccomp.la libseccomp.pxd seccomp.pyx setup.py
 	${PY_BUILD} && touch build
 
 install-exec-local: build
-	${PY_INSTALL} --install-lib=${DESTDIR}/${pkgpythondir} \
-		--record=${DESTDIR}/${pkgpythondir}/install_files.txt
+	${PY_INSTALL} --install-lib=${DESTDIR}/${pyexecdir} \
+		--record=${DESTDIR}/${pyexecdir}/install_files.txt
 
 uninstall-local:
-	cat ${DESTDIR}/${pkgpythondir}/install_files.txt | xargs ${RM} -f
-	${RM} -f ${DESTDIR}/${pkgpythondir}/install_files.txt
+	cat ${DESTDIR}/${pyexecdir}/install_files.txt | xargs ${RM} -f
+	${RM} -f ${DESTDIR}/${pyexecdir}/install_files.txt
 
 clean-local:
 	[ ${srcdir} == ${builddir} ] || ${RM} -f ${builddir}/seccomp.pyx