IntenseWebs/freeipa
3
0 Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2026-11-02 08:59:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

update prefix.patch

Browse Source
This commit is contained in:
Timo Aaltonen committed 2017-03-15 11:06:59 +02:00
1 parent b93aeed70b
commit 81d29bbb5f
2 files changed
+9 -60
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

debian/changelog
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ freeipa (4.5.0-1) UNRELEASED; urgency=medium
- Remove obsolete patches: fix-memcached.diff,
fix-oddjobs.diff
- Refresh patches: fix-dnssec-services.diff,
fix-ipa-conf.diff, fix-replicainstall.diff
fix-ipa-conf.diff, fix-replicainstall.diff, prefix.patch
* control et al: Memcached is not used anymore.
* control, server.install: Depend on gssproxy.
* control: Build-depend on python-jinja2, add CSR files to python-
debian/patches/prefix.patch
Vendored
+8 -59
View File
@@ -3,64 +3,13 @@ Date: Mon Jan 2 16:09:40 2012 +0200
use the debian layout when installing python modules
--- a/Makefile
+++ b/Makefile
@@ -118,9 +118,9 @@ client-install: client client-dirs
cd install/po && $(MAKE) install || exit 1;
@for subdir in $(CLIENTPYDIRS); do \
if [ "$(DESTDIR)" = "" ]; then \
- (cd $$subdir && $(PYTHON) setup.py install); \
+ (cd $$subdir && $(PYTHON) setup.py install --install-layout=deb); \
else \
- (cd $$subdir && $(PYTHON) setup.py install --root $(DESTDIR)); \
+ (cd $$subdir && $(PYTHON) setup.py install --root $(DESTDIR) --install-layout=deb); \
fi \
done
@@ -215,11 +215,11 @@ server: version-update
server-install: server
if [ "$(DESTDIR)" = "" ]; then \
- $(PYTHON) setup.py install; \
- (cd ipaplatform && $(PYTHON) setup.py install); \
+ $(PYTHON) setup.py install --install-layout=deb; \
+ (cd ipaplatform && $(PYTHON) setup.py install --install-layout=deb); \
else \
- $(PYTHON) setup.py install --root $(DESTDIR); \
- (cd ipaplatform && $(PYTHON) setup.py install --root $(DESTDIR)); \
+ $(PYTHON) setup.py install --root $(DESTDIR) --install-layout=deb; \
+ (cd ipaplatform && $(PYTHON) setup.py install --root $(DESTDIR) --install-layout=deb); \
--- a/Makefile.python.am
+++ b/Makefile.python.am
@@ -28,6 +28,7 @@ install-exec-local: $(top_builddir)/ipas
--prefix "$(DESTDIR)$(prefix)" \
--single-version-externally-managed \
--record "$(DESTDIR)$(pkgpythondir)/install_files.txt" \
+ --install-layout=deb \
--optimize 1; \
fi
tests: version-update tests-man-autogen
@@ -230,7 +230,7 @@ tests-install: tests
if [ "$(DESTDIR)" = "" ]; then \
cd ipatests; $(PYTHON) setup.py install; \
else \
- cd ipatests; $(PYTHON) setup.py install --root $(DESTDIR); \
+ cd ipatests; $(PYTHON) setup.py install --root $(DESTDIR) --install-layout=deb; \
fi
cd ipatests/man && $(MAKE) install
--- a/ipapython/Makefile
+++ b/ipapython/Makefile
@@ -13,7 +13,7 @@ install:
if [ "$(DESTDIR)" = "" ]; then \
$(PYTHON) setup.py install; \
else \
- $(PYTHON) setup.py install --root $(DESTDIR); \
+ $(PYTHON) setup.py install --root $(DESTDIR) --install-layout=deb; \
fi
@for subdir in $(SUBDIRS); do \
(cd $$subdir && $(MAKE) $@) || exit 1; \
--- a/ipalib/Makefile
+++ b/ipalib/Makefile
@@ -12,7 +12,7 @@ install:
if [ "$(DESTDIR)" = "" ]; then \
$(PYTHON) setup.py install; \
else \
- $(PYTHON) setup.py install --root $(DESTDIR); \
+ $(PYTHON) setup.py install --root $(DESTDIR) --install-layout=deb; \
fi
clean: