[gdm] data: install systemd unit even if unit dir already exists
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdm] data: install systemd unit even if unit dir already exists
- Date: Wed, 19 Apr 2017 14:04:54 +0000 (UTC)
commit 7ab7fb0ebf379643a24d9c90222410d32ca8b41d
Author: DJ Lucas <dj linuxfromscratch org>
Date: Wed Apr 19 01:13:14 2017 -0500
data: install systemd unit even if unit dir already exists
A logic error in the Makefile means that the systemd unit will
only get installed if the unit dir doesn't yet exist. That's normally
the case for package builds, but won't be the case at all for builds
from tarball.
This commit fixes up the logic.
https://bugzilla.gnome.org/show_bug.cgi?id=781082
data/Makefile.am | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 4dd255c..cb7c4cf 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -309,10 +309,13 @@ endif
chown root:gdm $(DESTDIR)$(xauthdir) || : ; \
fi
- if test -n "$(systemdsystemunit)" -a '!' -d $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR); then \
+ if test -n '!' -d $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR); then \
$(mkinstalldirs) $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR); \
chmod 0755 $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR); \
chown root:root $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR) || : ; \
+ fi
+
+ if test -n "$(systemdsystemunit)"; then \
$(INSTALL_DATA) $(builddir)/$(systemdsystemunit)
$(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR)/$(systemdsystemunit); \
fi
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]