diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-04-26 00:59:49 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-04-26 00:59:49 +0200 |
| commit | 6564651bcd196f7f0fa263db83d0775974bf4a1c (patch) | |
| tree | 6e329acf64c71c0a576cda02def2c77189ed7982 /Makefile.am | |
| parent | ace27c4a149b0b7d115c2ce1fee358386fb03eaf (diff) | |
| parent | 3590ecd60a4ce1f99f5d4c07d787dc134904894a (diff) | |
| download | lightdm-remote-session-x2go-6564651bcd196f7f0fa263db83d0775974bf4a1c.tar.gz lightdm-remote-session-x2go-6564651bcd196f7f0fa263db83d0775974bf4a1c.tar.bz2 lightdm-remote-session-x2go-6564651bcd196f7f0fa263db83d0775974bf4a1c.zip | |
Merge branch 'x2gosessiontype'
Conflicts (resolved by Mike Gabriel):
debian/changelog
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index fad0ac9..1081752 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,10 @@ - pam_sessiondir = $(sysconfdir)/pam.d/ pam_session_DATA = \ lightdm-remote-x2go lightdm_sessiondir = $(datadir)/lightdm/remote-sessions lightdm_session_DATA = \ - freerdp.desktop + x2go.desktop %.desktop: %.desktop.in @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ @@ -20,9 +19,9 @@ x2go-session: x2go-session.in apparmordir = $(sysconfdir)/apparmor.d/ apparmor_DATA = \ - lightdm-remote-session-freerdp + lightdm-remote-session-x2go -lightdm-remote-session-freerdp: lightdm-remote-session-freerdp.in +lightdm-remote-session-x2go: lightdm-remote-session-x2go.in @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ libexec_PROGRAMS = \ @@ -36,14 +35,14 @@ x2go_session_wrapper_CFLAGS = \ EXTRA_DIST = \ $(pam_session_DATA) \ - freerdp.desktop.in \ + x2go.desktop.in \ x2go-session.in \ - lightdm-remote-session-freerdp.in + lightdm-remote-session-x2go.in CLEANFILES = \ - freerdp.desktop \ + x2go.desktop \ x2go-session \ - lightdm-remote-session-freerdp + lightdm-remote-session-x2go DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall |