diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2006-05-09 17:32:40 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2006-05-09 17:32:40 +0000 |
| commit | 17f458cd6101af43cbd1c96042d628b2549e8060 (patch) | |
| tree | 25728569c72b4a4000dd48fb88bff58952a32e2e | |
| parent | 7ca4c93e80c0f6caa97c0ee9093593bbe5082c0f (diff) | |
| download | gdm-17f458cd6101af43cbd1c96042d628b2549e8060.tar.gz | |
Fix the installation of ssh.desktop and gdm-ssh-session so that the
2006-05-09 Brian Cameron <brian.cameron@sun.com>
* configure.ac, config/Makefile.am, utils/Makefile.am: Fix the
installation of ssh.desktop and gdm-ssh-session so that the
desktop file is translated and gdm-ssh-session is installed
to libexecdir. Fixes bugs #340958 and #340960.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | config/Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | utils/Makefile.am | 2 |
4 files changed, 9 insertions, 5 deletions
@@ -1,3 +1,10 @@ +2006-05-09 Brian Cameron <brian.cameron@sun.com> + + * configure.ac, config/Makefile.am, utils/Makefile.am: Fix the + installation of ssh.desktop and gdm-ssh-session so that the + desktop file is translated and gdm-ssh-session is installed + to libexecdir. Fixes bugs #340958 and #340960. + 2006-05-08 Brian Cameron <brian.cameron@sun.com> * gui/greeter/greeter_geometry.c: Now be smarter about child diff --git a/config/Makefile.am b/config/Makefile.am index fb1a7d18..347c181d 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -67,10 +67,6 @@ gdm.conf: $(srcdir)/gdm.conf.in -e 's,[@]sbindir[@],$(sbindir),g' \ <$(srcdir)/gdm.conf.in >gdm.conf -ssh.desktop: $(srcdir)/ssh.desktop.in - sed -e 's,[@]GDMSSHSESSIONCMD[@],$(GDMSSHSESSIONCMD),g' \ - <$(srcdir)/ssh.desktop.in >ssh.desktop - gettextfoo.h: XKeepsCrashing Xsession.in cat $^ | $(srcdir)/extract-shell.sh > gettextfoo.h diff --git a/configure.ac b/configure.ac index acd0c8a1..d8079a27 100644 --- a/configure.ac +++ b/configure.ac @@ -1112,6 +1112,7 @@ config/Init config/PreSession config/PostSession config/gdmprefetchlist +config/ssh.desktop.in gdm-stop gdm-restart gdm-safe-restart diff --git a/utils/Makefile.am b/utils/Makefile.am index 508db4c2..014cbcb6 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -12,6 +12,7 @@ INCLUDES = \ $(UTILS_CFLAGS) libexec_PROGRAMS = \ + @GDMSSHSESSION@ \ @GDMASKPASS@ \ @GDMOPEN@ \ @GDMPREFETCH@ \ @@ -21,7 +22,6 @@ if DMX_SUPPORT bin_PROGRAMS = gdm-dmx-reconnect-proxy endif -EXTRA_DIST = @GDMSSHSESSION@ EXTRA_PROGRAMS = gdmaskpass gdmopen gdmprefetch gdmaskpass_SOURCES = \ |