do not overwrite existing slim.conf when installing, added xfce4 session, leave numlock untouched by default

git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/slim/trunk@98 7c53e7cc-98ea-0310-8f1f-a0b24da60408

Makefile

@@ -37,7 +37,8 @@ slim: $(OBJECTS)
 install: slim install-theme
 	install -D -m 755 slim $(DESTDIR)$(PREFIX)/bin/slim
 	install -D -m 644 slim.1 $(DESTDIR)$(MANDIR)/man1/slim.1
-	install -D -m 644 slim.conf $(DESTDIR)$(CFGDIR)/slim.conf
+	test -e $(DESTDIR)$(CFGDIR)/slim.conf || \
+		install -D -m 644 slim.conf $(DESTDIR)$(CFGDIR)/slim.conf
 
 clean:
 	@rm -f slim *.o

Makefile.freebsd

@@ -40,7 +40,8 @@ install: slim install-theme
 	install -d $(DESTDIR)$(CFGDIR)
 	install -m 755 slim $(DESTDIR)$(PREFIX)/bin
 	install -m 644 slim.1 $(DESTDIR)$(MANDIR)/man1
-	install -m 644 slim.conf $(DESTDIR)$(CFGDIR)
+	test -e $(DESTDIR)$(CFGDIR)/slim.conf || \
+		install -m 644 slim.conf $(DESTDIR)$(CFGDIR)
 
 clean:
 	@rm -f slim *.o

Makefile.netbsd

@@ -40,7 +40,8 @@ install: slim install-theme
 	install -d $(DESTDIR)$(CFGDIR)
 	install -m 755 slim $(DESTDIR)$(PREFIX)/bin
 	install -m 644 slim.1 $(DESTDIR)$(MANDIR)/man1
-	install -m 644 slim.conf $(DESTDIR)$(CFGDIR)
+	test -e $(DESTDIR)$(CFGDIR)/slim.conf || \
+		install -m 644 slim.conf $(DESTDIR)$(CFGDIR)
 
 clean:
 	@rm -f slim *.o

Makefile.openbsd

@@ -63,7 +63,8 @@ install: slim install-theme
 	install -d $(DESTDIR)$(CFGDIR)
 	install -m 755 slim $(DESTDIR)$(PREFIX)/bin
 	install -m 644 slim.1 $(DESTDIR)$(MANDIR)/man1
-	install -m 644 slim.conf $(DESTDIR)$(CFGDIR)
+	test -e $(DESTDIR)$(CFGDIR)/slim.conf || \
+		install -m 644 slim.conf $(DESTDIR)$(CFGDIR)
 
 clean:
 	@rm -f slim *.o

slim.conf

@@ -10,7 +10,7 @@ console_cmd         /usr/X11R6/bin/xterm -C -fg white -bg black +sb -T "Console
 #suspend_cmd        /usr/sbin/suspend
 
 # Activate numlock when slim starts. Valid values: on|off
-numlock             on
+# numlock             on
 
 # This command is executed after a succesful login.
 # you can place the %session and %theme variables
@@ -39,7 +39,7 @@ login_cmd           exec /bin/bash -login ~/.xinitrc %session
 # The current chosen session name is replaced in the login_cmd
 # above, so your login command can handle different sessions.
 # see the xinitrc.sample file shipped with slim sources
-sessions            icewm,wmaker,blackbox
+sessions            xfce4,icewm,wmaker,blackbox
 
 # Executed when pressing F11 (requires imagemagick)
 screenshot_cmd      import -window root /slim.png

xinitrc.sample

@@ -1,4 +1,7 @@
 case $1 in
+xfce4)
+	exec startxfce4
+	;;
 icewm)
 	icewmbg &
 	icewmtray &