summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile7
-rw-r--r--debian/changelog6
2 files changed, 8 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 989cc53..36e0160 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@ bindir=${prefix}/bin
etcdir=/etc
mandir=${prefix}/share/man
vardir=/var
+systemddir=/lib/systemd/system
completiondir=${prefix}/share/bash-completion/completions
CP=cp -R
INSTALL=install
@@ -31,9 +32,9 @@ install: etckeeper.version
$(INSTALL_DATA) etckeeper.8 $(DESTDIR)$(mandir)/man8/etckeeper.8
mkdir -p $(DESTDIR)$(completiondir)
$(INSTALL_DATA) bash_completion $(DESTDIR)$(completiondir)/etckeeper
- mkdir -p $(DESTDIR)$(prefix)/lib/systemd/system/
- $(INSTALL_DATA) systemd/etckeeper.service $(DESTDIR)$(prefix)/lib/systemd/system/etckeeper.service
- $(INSTALL_DATA) systemd/etckeeper.timer $(DESTDIR)$(prefix)/lib/systemd/system/etckeeper.timer
+ mkdir -p $(DESTDIR)$(systemddir)
+ $(INSTALL_DATA) systemd/etckeeper.service $(DESTDIR)$(systemddir)/etckeeper.service
+ $(INSTALL_DATA) systemd/etckeeper.timer $(DESTDIR)$(systemddir)/etckeeper.timer
ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),apt)
mkdir -p $(DESTDIR)$(etcdir)/apt/apt.conf.d
$(INSTALL_DATA) apt.conf $(DESTDIR)$(etcdir)/apt/apt.conf.d/05etckeeper
diff --git a/debian/changelog b/debian/changelog
index 36521e5..16157a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,13 @@
-etckeeper (1.18.5) UNRELEASED; urgency=medium
+etckeeper (1.18.5) unstable; urgency=medium
* Make etckeeper commit store metadata changes. The pre-commit
hook has always (and continues) to do that, but pre-commit is only
run when there are changes to tommit. This makes metadata-only
changes get committed.
+ * Move systemd files to /lib/systemd; /usr/lib/systemd is not used
+ on Debian.
- -- Joey Hess <id@joeyh.name> Sun, 17 Jul 2016 18:45:18 -0400
+ -- Joey Hess <id@joeyh.name> Sun, 17 Jul 2016 18:53:54 -0400
etckeeper (1.18.4) unstable; urgency=medium