Attempt to fix session stuff on various distros.

SVN revision: 35398

misc/Makefile.am

@@ -1,31 +1,39 @@
 DESKTOPS = e16.desktop e16-gnome.desktop e16-kde.desktop
 DESKTOPS_IN = e16.desktop.in e16-gnome.desktop.in e16-kde.desktop.in
 XCLIENTS = Xclients.e16.sh Xclients.e16-gnome.sh Xclients.e16-kde.sh
-STARTUP = starte16
+STARTUPS = starte16-gnome starte16-kde
 ICONS = e16.png
 
-bin_SCRIPTS = starte16
-
 miscdir = $(pkgdatadir)/misc
 misc_DATA = $(ICONS) $(DESKTOPS)
-misc_SCRIPTS = $(XCLIENTS)
+misc_SCRIPTS = $(XCLIENTS) starte16 e16-dbus-cmd
 
 xsessiondir = $(datadir)/xsessions
-xsession_DATA = $(DESKTOPS)
+#xsession_DATA = $(DESKTOPS)
 
 # Is this Fedora only stuff?
 #xclientsdir = $(sysconfdir)/X11/xinit/Xclients.d
 #xclients_SCRIPTS = $(XCLIENTS)
 
-EXTRA_DIST = $(DESKTOPS_IN) $(SCRIPTS) $(ICONS) e16-dbus-cmd
+EXTRA_DIST = $(DESKTOPS_IN) $(XCLIENTS) $(SCRIPTS) $(ICONS)
 
 e16.desktop: $(top_srcdir)/misc/e16.desktop.in Makefile
 e16-gnome.desktop: $(top_srcdir)/misc/e16-gnome.desktop.in Makefile
 e16-kde.desktop: $(top_srcdir)/misc/e16-kde.desktop.in Makefile
 
 $(DESKTOPS):
-	sed -e "s=@pkgdatadir@=${pkgdatadir}=" $(top_srcdir)/misc/$@.in >$@
+	sed -e "s=@pkgdatadir@=${pkgdatadir}=" $(top_srcdir)/misc/$@.in > $@
+
+install-data-hook:
+	cd $(DESTDIR)$(bindir); rm -f starte16; $(LN_S) $(miscdir)/starte16 .
+	$(mkinstalldirs) $(DESTDIR)$(xsessiondir)
+	cd $(DESTDIR)$(xsessiondir); rm -f $(DESKTOPS); \
+	  for f in $(DESKTOPS); do $(LN_S) $(miscdir)/$$f .; done
+	cd $(DESTDIR)$(miscdir); rm -f $(STARTUPS); \
+	  for f in $(STARTUPS); do $(LN_S) starte16 $$f; done
 
 uninstall-local:
 	rm -f $(DESKTOPS)
-
+	cd $(DESTDIR)$(bindir); rm -f starte16
+	cd $(DESTDIR)$(xsessiondir); rm -f $(DESKTOPS)
+	cd $(DESTDIR)$(miscdir); rm -f $(STARTUPS)

misc/e16-gnome.desktop.in

@@ -3,5 +3,5 @@ Encoding=UTF-8
 Type=XSession
 Name=E16-GNOME
 Comment=This session starts GNOME using enlightenment (e16) as window manager
-Exec=e16-gnome
+Exec=@pkgdatadir@/misc/starte16-gnome
 Icon=@pkgdatadir@/misc/e16.png

misc/e16-kde.desktop.in

@@ -3,5 +3,5 @@ Encoding=UTF-8
 Type=XSession
 Name=E16-KDE
 Comment=This session starts KDE using enlightenment (e16) as window manager
-Exec=e16-kde
+Exec=@pkgdatadir@/misc/starte16-kde
 Icon=@pkgdatadir@/misc/e16.png

misc/e16.desktop.in

@@ -3,5 +3,5 @@ Encoding=UTF-8
 Type=XSession
 Name=E16
 Comment=This session starts the Enlightenment (e16) window manager
-Exec=e16
+Exec=@pkgdatadir@/misc/starte16
 Icon=@pkgdatadir@/misc/e16.png

misc/starte16

@@ -1,10 +1,14 @@
 #!/bin/sh
-case "$1" in
-gnome|GNOME)
+
+s=$1
+test -z "$s" && s=$0
+
+case "$s" in
+*gnome|GNOME)
 	export WINDOW_MANAGER=e16
 	exec gnome-session
 	;;
-kde|KDE)
+*kde|KDE)
 	export KDEWM=e16
 	exec startkde
 	;;