diff options
| author | DJ Lucas <dj@linuxfromscratch.org> | 2017-04-19 01:13:14 -0500 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2017-04-19 10:03:13 -0400 |
| commit | 7ab7fb0ebf379643a24d9c90222410d32ca8b41d (patch) | |
| tree | 40b339c431271e6900c47f2b49e267800445f402 /data | |
| parent | 0ab4f635630cfd90b73cd138144999834d4d2c39 (diff) | |
| download | gdm-7ab7fb0ebf379643a24d9c90222410d32ca8b41d.tar.gz | |
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
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 4dd255c3..cb7c4cfc 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 |