diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2015-06-01 07:55:56 -0700 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2015-06-01 08:15:29 -0700 |
| commit | afca46ed9b268b5d19dfc645ddd7a06cca5ae08e (patch) | |
| tree | 25b752a34cf62bdca0eaa78179812e318cc777ce /data | |
| parent | 11367b472fa733fabf39f2c00896859ab147e4eb (diff) | |
| download | gdm-afca46ed9b268b5d19dfc645ddd7a06cca5ae08e.tar.gz | |
Make Xsession installation conditional, and off by default
Most distros use custom logic for their Xsession, so we can't really
ship a default here. Doing so would break people running "make install"
and expecting things to work.
https://bugzilla.gnome.org/show_bug.cgi?id=750220
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 7d521bbb..1bc8d7dc 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -16,11 +16,6 @@ xauthdir = $(GDM_XAUTH_DIR) screenshotdir = $(GDM_SCREENSHOT_DIR) cachedir = $(localstatedir)/cache/gdm -Xsession: $(srcdir)/Xsession.in - sed -e 's,[@]XSESSION_SHELL[@],$(XSESSION_SHELL),g' \ - -e 's,[@]libexecdir[@],$(libexecdir),g' \ - <$(srcdir)/Xsession.in >Xsession - Init: $(srcdir)/Init.in sed -e 's,[@]X_PATH[@],$(X_PATH),g' \ <$(srcdir)/Init.in >Init @@ -195,6 +190,18 @@ CLEANFILES += gdm.service endif +Xsession_files = +if ENABLE_GDM_XSESSION + +Xsession: $(srcdir)/Xsession.in + sed -e 's,[@]XSESSION_SHELL[@],$(XSESSION_SHELL),g' \ + -e 's,[@]libexecdir[@],$(libexecdir),g' \ + <$(srcdir)/Xsession.in >Xsession +Xsession_files += Xsession +CLEANFILES += Xsession + +endif + EXTRA_DIST += gdm.service.in uninstall-hook: @@ -218,7 +225,7 @@ uninstall-hook: fi -install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession $(systemdsystemunit) +install-data-hook: gdm.conf-custom $(Xsession_files) Init PostSession PreSession $(systemdsystemunit) if test '!' -d $(DESTDIR)$(gdmconfdir); then \ $(mkinstalldirs) $(DESTDIR)$(gdmconfdir); \ chmod 755 $(DESTDIR)$(gdmconfdir); \ @@ -228,7 +235,9 @@ install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession $(system chmod 644 $(DESTDIR)$(GDM_CUSTOM_CONF); \ fi +if ENABLE_GDM_XSESSION $(INSTALL_SCRIPT) Xsession $(DESTDIR)$(gdmconfdir)/Xsession +endif if test '!' -d $(DESTDIR)$(initdir); then \ $(mkinstalldirs) $(DESTDIR)$(initdir); \ |