rules: Fix paths in oddjob configs.

This commit is contained in:
Timo Aaltonen
2016-01-05 13:26:35 +02:00
parent feb6cf213a
commit c5643d782d
2 changed files with 8 additions and 0 deletions

1
debian/changelog vendored
View File

@@ -32,6 +32,7 @@ freeipa (4.3.0-1) UNRELEASED; urgency=medium
* control, server: Migrate to mod-auth-gssapi. * control, server: Migrate to mod-auth-gssapi.
* Split freeipa-server-dns from server. * Split freeipa-server-dns from server.
* admintools: Use the new location for bash completions. * admintools: Use the new location for bash completions.
* rules: Fix paths in oddjob configs.
-- Timo Aaltonen <tjaalton@debian.org> Sat, 03 Oct 2015 08:56:31 +0300 -- Timo Aaltonen <tjaalton@debian.org> Sat, 03 Oct 2015 08:56:31 +0300

7
debian/rules vendored
View File

@@ -3,6 +3,8 @@
# Uncomment this to turn on verbose mode. # Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1 #export DH_VERBOSE=1
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
ONLY_CLIENT=0 ONLY_CLIENT=0
DESTDIR=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
@@ -81,6 +83,11 @@ ifneq ($(ONLY_CLIENT), 1)
install -m 0644 init/systemd/ipa_memcached.service $(DESTDIR)/lib/systemd/system install -m 0644 init/systemd/ipa_memcached.service $(DESTDIR)/lib/systemd/system
install -m 0644 init/systemd/ipa.service $(DESTDIR)/lib/systemd/system install -m 0644 init/systemd/ipa.service $(DESTDIR)/lib/systemd/system
install -m 0755 debian/generate-rndc-key.sh $(DESTDIR)/usr/share/ipa install -m 0755 debian/generate-rndc-key.sh $(DESTDIR)/usr/share/ipa
for i in $(DESTDIR)/etc/oddjobd.conf.d/ipa-server.conf \
$(DESTDIR)/etc/oddjobd.conf.d/oddjobd-ipa-trust.conf; do \
sed -i -e"s/libexec.*\//lib\/$(DEB_HOST_MULTIARCH)\/ipa\/oddjob\//" $$i ; \
done
else else
make $(PLATFORM) IPA_VERSION_IS_GIT_SNAPSHOT=no client-install DESTDIR=$(DESTDIR) make $(PLATFORM) IPA_VERSION_IS_GIT_SNAPSHOT=no client-install DESTDIR=$(DESTDIR)
endif endif