IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-24 16:10:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

let pysupport handle the installation paths

Browse Source
This commit is contained in:
Timo Aaltonen 2011-11-01 20:00:09 -04:00
parent a352099406
commit 3f9041f41d
4 changed files with 6 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -17,7 +17,6 @@ freeipa (2.1.3-1) UNRELEASED; urgency=low
* Add no-testcert.patch to not fail make-testcert.
* Bump compat to 8.
* Add missing files to freeipa.install.
* Add fix-python-path.patch to use --install-layout=deb.
* Add --list-missing for dh_install.
-- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 01 Nov 2011 10:52:25 -0400

48
debian/patches/fix-python-path.patch vendored
View File

@ -1,48 +0,0 @@
diff --git a/Makefile b/Makefile
index 9d88025..d949d82 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@ RPMBUILD ?= $(PWD)/rpmbuild
TARGET ?= master
SUPPORTED_PLATFORM=redhat
+PYTHONLIBDIR ?= $(shell python -c "from distutils.sysconfig import *; print get_python_lib()")
# After updating the version in VERSION you should run the version-update
# target.
@@ -76,7 +76,7 @@ client-install: client
if [ "$(DESTDIR)" = "" ]; then \
python setup-client.py install; \
else \
- python setup-client.py install --root $(DESTDIR); \
+ python setup-client.py install --root $(DESTDIR) --install-lib=$(PYTHONLIBDIR); \
fi
lint:
diff --git a/ipapython/Makefile b/ipapython/Makefile
index a09ffd1..112b02a 100644
--- a/ipapython/Makefile
+++ b/ipapython/Makefile
@@ -14,7 +14,7 @@ install:
if [ "$(DESTDIR)" = "" ]; then \
python setup.py install; \
else \
- python setup.py install --root $(DESTDIR); \
+ python setup.py install --root $(DESTDIR) --install-lib=$(PYTHONLIBDIR); \
fi
@for subdir in $(SUBDIRS); do \
(cd $$subdir && $(MAKE) $@) || exit 1; \
diff --git a/ipapython/py_default_encoding/Makefile b/ipapython/py_default_encoding/Makefile
index 7cd1f6c..744cba7 100644
--- a/ipapython/py_default_encoding/Makefile
+++ b/ipapython/py_default_encoding/Makefile
@@ -9,7 +9,7 @@ install:
if [ "$(DESTDIR)" = "" ]; then \
python setup.py install; \
else \
- python setup.py install --root $(DESTDIR); \
+ python setup.py install --root $(DESTDIR) --install-lib=$(PYTHONLIBDIR); \
fi
clean:

1
debian/patches/series vendored
View File

@ -5,4 +5,3 @@ add_debian.py.patch
include-stdint.patch
no-arrows.patch
no-testcert.patch
fix-python-path.patch

12
debian/python-freeipa.install vendored
View File

@ -1,9 +1,9 @@
#etc/ipa/ipa.conf
usr/lib/python2.7/dist-packages/ipalib/*
usr/lib/python2.7/dist-packages/ipapython/*
usr/lib/python2.7/dist-packages/default_encoding_utf8.so
usr/lib/python2.7/dist-packages/ipapython-*.egg-info
usr/lib/python2.7/dist-packages/freeipa-*.egg-info
usr/lib/python2.7/dist-packages/python_default_encoding-*.egg-info
usr/local/lib/python2.7/dist-packages/ipalib/*
usr/local/lib/python2.7/dist-packages/ipapython/*
usr/local/lib/python2.7/dist-packages/default_encoding_utf8.so
usr/local/lib/python2.7/dist-packages/ipapython-*.egg-info
usr/local/lib/python2.7/dist-packages/freeipa-*.egg-info
usr/local/lib/python2.7/dist-packages/python_default_encoding-*.egg-info
usr/share/locale
etc/ipa/default.conf