From 6c55f2a5af508a08c19f07d913c491192ea0f0bb Mon Sep 17 00:00:00 2001 From: Timo Aaltonen Date: Wed, 13 Feb 2013 01:02:55 +0200 Subject: [PATCH] fix-install-layout.diff: Pass an option to setup-client.py to install the python bits to the correct path. --- debian/changelog | 2 ++ debian/patches/fix-install-layout.diff | 14 ++++++++++++++ debian/patches/series | 1 + 3 files changed, 17 insertions(+) create mode 100644 debian/patches/fix-install-layout.diff diff --git a/debian/changelog b/debian/changelog index e721ad2cf..259d5dc04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,5 +33,7 @@ freeipa (3.1.2-1) UNRELEASED; urgency=low fails. * dont-search-platform-path.diff: Don't use Python.h from the platform specific path. + * fix-install-layout.diff: Pass an option to setup-client.py to + install the python bits to the correct path. -- Timo Aaltonen Tue, 01 Nov 2011 10:52:25 -0400 diff --git a/debian/patches/fix-install-layout.diff b/debian/patches/fix-install-layout.diff new file mode 100644 index 000000000..53e48928a --- /dev/null +++ b/debian/patches/fix-install-layout.diff @@ -0,0 +1,14 @@ +--- a/Makefile ++++ b/Makefile +@@ -76,9 +76,9 @@ client-install: client client-dirs + done + cd install/po && $(MAKE) install || exit 1; + if [ "$(DESTDIR)" = "" ]; then \ +- $(PYTHON) setup-client.py install; \ ++ $(PYTHON) setup-client.py install --install-layout=deb; \ + else \ +- $(PYTHON) setup-client.py install --root $(DESTDIR); \ ++ $(PYTHON) setup-client.py install --install-layout=deb --root $(DESTDIR); \ + fi + + client-dirs: diff --git a/debian/patches/series b/debian/patches/series index f6a62429d..4d1e2a6b1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ fix-nss-include.diff no-test-lang.diff correct-python-path.diff dont-search-platform-path.diff +fix-install-layout.diff