From bf7093b8c45c7a38a2f42ddb61135fca7566ff5e Mon Sep 17 00:00:00 2001
From: Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
Date: Sun, 7 Mar 2010 11:03:53 +0800
Subject: [PATCH 8/9] * Fix config file of pcmanfm2.
 * Fix autostart for pcmanfm2.

---
 Makefile.am             |    6 +++---
 autostart               |    2 +-
 configure.ac            |   11 ++++++++++-
 pcmanfm/lxde.conf.in    |   20 ++++++++++++++++++++
 pcmanfm/pcmanfm.conf.in |   20 --------------------
 5 files changed, 34 insertions(+), 25 deletions(-)
 create mode 100644 pcmanfm/lxde.conf.in
 delete mode 100644 pcmanfm/pcmanfm.conf.in

diff --git a/Makefile.am b/Makefile.am
index dc0b332..61cf4c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,9 +31,9 @@ openbox_DATA= \
 	openbox/rc.xml \
 	openbox/menu.xml
 
-pcmanfmdir=$(datadir)/lxde/pcmanfm
+pcmanfmdir=$(sysconfdir)/xdg/pcmanfm
 pcmanfm_DATA= \
-	pcmanfm/pcmanfm.conf
+	pcmanfm/lxde.conf
 
 EXTRA_DIST = \
 	autostart \
@@ -45,7 +45,7 @@ EXTRA_DIST = \
 	openbox/rc.xml.in \
 	openbox/menu.xml \
 	openbox-lxde.in \
-	pcmanfm/pcmanfm.conf.in \
+	pcmanfm/lxde.conf.in \
 	$(lxpanel_DATA) \
 	lxpanel/panel.in
 
diff --git a/autostart b/autostart
index 946eac7..5c5aee3 100644
--- a/autostart
+++ b/autostart
@@ -1,3 +1,3 @@
 @lxpanel --profile LXDE
-@pcmanfm --desktop
+@pcmanfm2 --desktop --profile lxde
 @xscreensaver -no-splash
diff --git a/configure.ac b/configure.ac
index b5dc864..d717f2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,7 +48,16 @@ AC_OUTPUT([
   lxpanel/panel
   openbox/rc.xml
   openbox-lxde
-  pcmanfm/pcmanfm.conf
+  pcmanfm/lxde.conf
   man/Makefile
 ])
 
+if test x"$sysconfdir" != x'/etc'; then
+    echo
+    echo
+    echo 'Error: sysconfdir is not /etc.'
+    echo 'Please consider passing --sysconfdir=/etc to configure.';
+    echo 'Otherwise default config files will be installed to wrong place.'
+    echo
+    echo
+fi
diff --git a/pcmanfm/lxde.conf.in b/pcmanfm/lxde.conf.in
new file mode 100644
index 0000000..6799e1f
--- /dev/null
+++ b/pcmanfm/lxde.conf.in
@@ -0,0 +1,20 @@
+[config]
+bm_open_method=0
+su_cmd=xdg-su -c '%s'
+
+[desktop]
+wallpaper_mode=1
+wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg
+desktop_bg=#000000
+desktop_fg=#ffffff
+desktop_shadow=#000000
+
+[ui]
+always_show_tabs=0
+hide_close_btn=0
+win_width=640
+win_height=480
+view_mode=0
+show_hidden=0
+sort_type=0
+sort_by=0
diff --git a/pcmanfm/pcmanfm.conf.in b/pcmanfm/pcmanfm.conf.in
deleted file mode 100644
index 6799e1f..0000000
--- a/pcmanfm/pcmanfm.conf.in
+++ /dev/null
@@ -1,20 +0,0 @@
-[config]
-bm_open_method=0
-su_cmd=xdg-su -c '%s'
-
-[desktop]
-wallpaper_mode=1
-wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg
-desktop_bg=#000000
-desktop_fg=#ffffff
-desktop_shadow=#000000
-
-[ui]
-always_show_tabs=0
-hide_close_btn=0
-win_width=640
-win_height=480
-view_mode=0
-show_hidden=0
-sort_type=0
-sort_by=0
-- 
1.6.6.1