diff options
| author | Ray Strode <rstrode@redhat.com> | 2017-06-22 14:28:46 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2017-06-22 14:28:46 -0400 |
| commit | d126c5a535d595a201cb8fe0b933738018101398 (patch) | |
| tree | b923add708e2471cd79a2f60a2af78e9e3997dfc | |
| parent | 1aba5138d6692b36154f290143e0ac6bb9a543c5 (diff) | |
| download | gdm-d126c5a535d595a201cb8fe0b933738018101398.tar.gz | |
build-goo: fix distcheck
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | data/Makefile.am | 23 |
3 files changed, 9 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am index d3c46c8f..a6409e1b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,4 +30,4 @@ EXTRA_DIST = \ DISTCLEANFILES = \ $(NULL) -AM_DISTCHECK_CONFIGURE_FLAGS = --enable-split-authentication --enable-introspection +AM_DISTCHECK_CONFIGURE_FLAGS = --enable-split-authentication --enable-introspection --without-systemdsystemunitdir diff --git a/configure.ac b/configure.ac index 18c330a7..59edd7b4 100644 --- a/configure.ac +++ b/configure.ac @@ -948,6 +948,8 @@ if test "x$with_systemdsystemunitdir" != xno; then AC_SUBST(SYSTEMD_SYSTEM_UNIT_DIR, [$with_systemdsystemunitdir]) fi +AM_CONDITIONAL(INSTALL_SYSTEMD_UNITS, test x$with_systemdsystemunitdir != xno) + dnl --------------------------------------------------------------------------- dnl - Check for plymouth support dnl --------------------------------------------------------------------------- diff --git a/data/Makefile.am b/data/Makefile.am index d0111342..f2875fcb 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -198,6 +198,11 @@ gdm.service: $(srcdir)/gdm.service.in systemdsystemunit += gdm.service CLEANFILES += gdm.service +if INSTALL_SYSTEMD_UNITS +systemdsystemunit_DATA=$(systemdsystemunit) +systemdsystemunitdir=$(SYSTEMD_SYSTEM_UNIT_DIR) +endif + Xsession_files = if ENABLE_GDM_XSESSION @@ -227,13 +232,7 @@ uninstall-hook: $(DESTDIR)$(xauthdir) \ $(DESTDIR)$(PAM_PREFIX)/pam.d - if test -n "$(systemdsystemunit)"; then \ - rm -f $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR)/$(systemdsystemunit); \ - rmdir $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR) || : ; \ - fi - - -install-data-hook: gdm.conf-custom $(Xsession_files) Init PostSession PreSession $(systemdsystemunit) +install-data-hook: gdm.conf-custom $(Xsession_files) Init PostSession PreSession if test '!' -d $(DESTDIR)$(gdmconfdir); then \ $(mkinstalldirs) $(DESTDIR)$(gdmconfdir); \ chmod 755 $(DESTDIR)$(gdmconfdir); \ @@ -309,16 +308,6 @@ endif chown root:gdm $(DESTDIR)$(xauthdir) || : ; \ fi - if test '!' -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 - if test '!' -d $(DESTDIR)$(screenshotdir); then \ $(mkinstalldirs) $(DESTDIR)$(screenshotdir); \ chmod 0755 $(DESTDIR)$(screenshotdir); \ |