diff --git a/debian/freeipa-client-epn.install b/debian/freeipa-client-epn.install index 76901fd..b3a99b2 100644 --- a/debian/freeipa-client-epn.install +++ b/debian/freeipa-client-epn.install @@ -1,7 +1,7 @@ etc/ipa/epn.conf etc/ipa/epn/expire_msg.template -lib/systemd/system/ipa-epn.service -lib/systemd/system/ipa-epn.timer +${env:systemdsystemunitdir}/ipa-epn.service +${env:systemdsystemunitdir}/ipa-epn.timer usr/sbin/ipa-epn usr/share/man/man1/ipa-epn.1 usr/share/man/man5/epn.conf.5 diff --git a/debian/freeipa-server.install b/debian/freeipa-server.install index cdc9663..b9c0a0c 100644 --- a/debian/freeipa-server.install +++ b/debian/freeipa-server.install @@ -4,15 +4,15 @@ etc/ipa/html/* etc/ipa/kdcproxy etc/dbus-1/system.d/org.freeipa.server.conf etc/oddjobd.conf.d/ipa-server.conf -lib/systemd/system/ipa-ccache-sweep.service -lib/systemd/system/ipa-ccache-sweep.timer -lib/systemd/system/ipa-custodia.service -lib/systemd/system/ipa-dnskeysyncd.service -lib/systemd/system/ipa-ods-exporter.service -lib/systemd/system/ipa-ods-exporter.socket -lib/systemd/system/ipa-otpd.socket -lib/systemd/system/ipa-otpd@.service -lib/systemd/system/ipa.service +${env:systemdsystemunitdir}/ipa-ccache-sweep.service +${env:systemdsystemunitdir}/ipa-ccache-sweep.timer +${env:systemdsystemunitdir}/ipa-custodia.service +${env:systemdsystemunitdir}/ipa-dnskeysyncd.service +${env:systemdsystemunitdir}/ipa-ods-exporter.service +${env:systemdsystemunitdir}/ipa-ods-exporter.socket +${env:systemdsystemunitdir}/ipa-otpd.socket +${env:systemdsystemunitdir}/ipa-otpd@.service +${env:systemdsystemunitdir}/ipa.service usr/lib/*/dirsrv/plugins/libipa_cldap.so usr/lib/*/dirsrv/plugins/libipa_dns.so usr/lib/*/dirsrv/plugins/libipa_enrollment_extop.so diff --git a/debian/rules b/debian/rules index 6b78e88..1946382 100755 --- a/debian/rules +++ b/debian/rules @@ -20,7 +20,14 @@ DESTDIR=$(CURDIR)/debian/tmp export PYTHON=python3 export am_cv_python_pythondir=/usr/lib/python3/dist-packages export am_cv_python_pyexecdir=/usr/lib/python3/dist-packages -export systemdsystemunitdir=$(shell pkgconf --variable=systemdsystemunitdir systemd | sed s,^/,,) +#export systemdsystemunitdir=$(shell pkgconf --variable=systemdsystemunitdir systemd | sed s,^/,,) + +systemdsystemunitdir := $(shell pkgconf --variable=systemdsystemunitdir systemd 2>/dev/null | sed 's,^/,,') +ifeq ($(systemdsystemunitdir),) +systemdsystemunitdir := lib/systemd/system +endif + +export systemdsystemunitdir confflags = \ --libexecdir=/usr/lib/ \