--- Makefile.am.bak	2009-06-13 16:51:53.000000000 +0000
+++ Makefile.am	2009-06-13 16:55:45.000000000 +0000
@@ -18,7 +18,6 @@
 
 x11dir = $(sysconfdir)/X11
 x11_SCRIPTS = gpe-login.setup X11/gpe-login.pre-session
-x11_DATA = gpe-login.keylaunchrc X11/gpe-login.gtkrc
 
 apmdir = $(sysconfdir)/apm/suspend.d
 apm_SCRIPTS = gpe-login.suspend 
@@ -26,15 +25,12 @@
 xsessiondir = $(sysconfdir)/X11/Xsession.d
 xsession_SCRIPTS = gpe-login.session
 
-xinitdir = $(sysconfdir)/X11/Xinit.d
+xinitdir = $(sysconfdir)/X11/gpe-dm/Xinit.d
 xinit_SCRIPTS = gpe-login.xinit
 
 gpedir = $(sysconfdir)/gpe
 gpe_DATA = gpe-login.conf locale.alias
 
-sysdir = $(sysconfdir)/sysconfig
-sys_DATA = gpe-login.sysconfig
-
 pixmapsdir = $(datadir)/gpe/pixmaps/default
 pixmaps_DATA = \
                pixmaps/session-back.png \
@@ -46,12 +42,10 @@
 
 EXTRA_DIST = \
              $(x11_SCRIPTS) \
-             $(x11_DATA) \
              $(apm_SCRIPTS) \
              $(xsession_SCRIPTS) \
              $(xinit_SCRIPTS) \
              $(gpe_DATA) \
-             $(sys_DATA) \
              $(pixmaps_DATA) \
              intltool-extract.in \
              intltool-merge.in \
@@ -66,13 +60,11 @@
 	cd $(DESTDIR)$(apmdir) && mv gpe-login.suspend S98lock-display
 	cd $(DESTDIR)$(xsessiondir) && mv gpe-login.session 50autolock
 	cd $(DESTDIR)$(xinitdir) && mv gpe-login.xinit 99gpe-login
-	cd $(DESTDIR)$(sysdir) && mv gpe-login.sysconfig gpelogin
 
 uninstall-hook:
 	$(RM) -f $(DESTDIR)$(apmdir)/S98lock-display
 	$(RM) -f $(DESTDIR)$(xsessiondir)/50autolock
 	$(RM) -f $(DESTDIR)$(xinitdir)/99gpe-login
-	$(RM) -f $(DESTDIR)$(sysdir)/gpelogin
 	
 clean-local:
 	rm -f *.d *~