Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/misc
Modified Files:
Makefile.am e16-gnome.desktop.in e16-kde.desktop.in
e16.desktop.in starte16
Log Message:
Attempt to fix session stuff on various distros.
===================================================================
RCS file: /cvs/e/e16/e/misc/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- Makefile.am 8 Dec 2007 17:54:38 -0000 1.11
+++ Makefile.am 7 Aug 2008 23:27:52 -0000 1.12
@@ -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 "[EMAIL PROTECTED]@=${pkgdatadir}=" $(top_srcdir)/misc/[EMAIL
PROTECTED] >$@
+ sed -e "[EMAIL PROTECTED]@=${pkgdatadir}=" $(top_srcdir)/misc/[EMAIL
PROTECTED] > $@
+
+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)
===================================================================
RCS file: /cvs/e/e16/e/misc/e16-gnome.desktop.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e16-gnome.desktop.in 21 Dec 2007 21:15:23 -0000 1.4
+++ e16-gnome.desktop.in 7 Aug 2008 23:27:52 -0000 1.5
@@ -3,5 +3,5 @@
Type=XSession
Name=E16-GNOME
Comment=This session starts GNOME using enlightenment (e16) as window manager
-Exec=e16-gnome
[EMAIL PROTECTED]@/misc/starte16-gnome
[EMAIL PROTECTED]@/misc/e16.png
===================================================================
RCS file: /cvs/e/e16/e/misc/e16-kde.desktop.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e16-kde.desktop.in 21 Dec 2007 21:15:23 -0000 1.4
+++ e16-kde.desktop.in 7 Aug 2008 23:27:52 -0000 1.5
@@ -3,5 +3,5 @@
Type=XSession
Name=E16-KDE
Comment=This session starts KDE using enlightenment (e16) as window manager
-Exec=e16-kde
[EMAIL PROTECTED]@/misc/starte16-kde
[EMAIL PROTECTED]@/misc/e16.png
===================================================================
RCS file: /cvs/e/e16/e/misc/e16.desktop.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e16.desktop.in 18 Nov 2007 09:54:49 -0000 1.3
+++ e16.desktop.in 7 Aug 2008 23:27:52 -0000 1.4
@@ -3,5 +3,5 @@
Type=XSession
Name=E16
Comment=This session starts the Enlightenment (e16) window manager
-Exec=e16
[EMAIL PROTECTED]@/misc/starte16
[EMAIL PROTECTED]@/misc/e16.png
===================================================================
RCS file: /cvs/e/e16/e/misc/starte16,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- starte16 5 Jun 2007 16:50:30 -0000 1.3
+++ starte16 7 Aug 2008 23:27:52 -0000 1.4
@@ -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
;;
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
