Gathers config files in same directory.

4 files changed, 11 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bc04accd9432..993988b68877 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xdm-xfreq
 	pkgdesc = A customized XDM for XFreq
-	pkgver = 0.6
+	pkgver = 0.7
 	pkgrel = 1
 	url = http://github.com/cyring/xdm-xfreq
 	install = xdm-xfreq.install
@@ -10,6 +10,7 @@ pkgbase = xdm-xfreq
 	depends = xorg-xclock
 	depends = xorg-xmessage
 	depends = xorg-xdpyinfo
+	depends = gawk
 	optdepends = xfreq-git
 	optdepends = scrot
 	optdepends = imagemagick
@@ -17,6 +18,7 @@ pkgbase = xdm-xfreq
 	optdepends = numlockx
 	backup = etc/xdm-xfreq/Xresources
 	backup = etc/xdm-xfreq/xdm-xfreq.rc
+	backup = etc/xdm-xfreq/xdm-config
 	source = xdm-config
 	source = Xsetup
 	source = Xstartup
diff --git a/PKGBUILD b/PKGBUILD
index 5f616e734ce9..e66a667b6433 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,17 @@
 # Maintainer: CyrIng <xfreq[at]cyring[dot]fr>
 # Contributor: CyrIng <xfreq[at]cyring[dot]fr>
 pkgname=xdm-xfreq
-pkgver=0.6
+pkgver=0.7
 pkgrel=1
 pkgdesc="A customized XDM for XFreq"
 arch=(any)
 license=('GPL')
 url="http://github.com/cyring/xdm-xfreq"
-depends=('xorg-xdm' 'xorg-xclock' 'xorg-xmessage' 'xorg-xdpyinfo')
+depends=('xorg-xdm' 'xorg-xclock' 'xorg-xmessage' 'xorg-xdpyinfo' 'gawk')
 optdepends=('xfreq-git' 'scrot' 'imagemagick' 'xorg-xsetroot' 'numlockx')
 backup=(etc/xdm-xfreq/Xresources
-	etc/xdm-xfreq/xdm-xfreq.rc)
+	etc/xdm-xfreq/xdm-xfreq.rc
+	etc/xdm-xfreq/xdm-config)
 install=xdm-xfreq.install
 source=(xdm-config
 	Xsetup
@@ -31,10 +32,10 @@ md5sums=('SKIP'
 
 package() {
   mkdir -p ${pkgdir}/etc/xdm-xfreq
-  cp Xresources xdm-xfreq.rc ${pkgdir}/etc/xdm-xfreq
+  cp Xresources xdm-xfreq.rc xdm-config ${pkgdir}/etc/xdm-xfreq
   chmod 0755 ${pkgdir}/etc/xdm-xfreq/xdm-xfreq.rc
   mkdir -p ${pkgdir}/etc/X11/xdm/xdm-xfreq
-  cp Xsession Xsetup Xstartup xdm-config ${pkgdir}/etc/X11/xdm/xdm-xfreq
+  cp Xsession Xsetup Xstartup ${pkgdir}/etc/X11/xdm/xdm-xfreq
   chmod 0755 ${pkgdir}/etc/X11/xdm/xdm-xfreq/{Xsession,Xsetup,Xstartup}
   install -Dm755 ${srcdir}/xdm-xfreq-xdesktops ${pkgdir}/usr/lib/systemd/scripts/xdm-xfreq-xdesktops
   install -Dm0644 ${srcdir}/xdm-xfreq.service ${pkgdir}/usr/lib/systemd/system/xdm-xfreq.service
diff --git a/xdm-xfreq.rc b/xdm-xfreq.rc
index 359075822408..1edb70ac6446 100755
--- a/xdm-xfreq.rc
+++ b/xdm-xfreq.rc
@@ -48,7 +48,7 @@ XDM_XFREQ_SCREENSAVER[5]=1500
 
 # XFreq
 XDM_XFREQ_GUI_PATH=xfreq-gui
-XDM_XFREQ_GUI_ARGS="-D 0 -f 0x994c00 -l 1 -w 1 -n 1 -N 1 -I 0x1000 -U 0x21 -g 0:0x0+540-48,1:0x0-24+16,2:0x0+24+16,3:0x0+540+16,4:0x0+24-48,5:0x0-24-48"
+XDM_XFREQ_GUI_ARGS="-D 0 -f 0x994c00 -l 1 -w 1 -n 1 -N 1 -I 0x1000 -U 0x21 -g 0:0x0+24-48,1:0x0-24+16,2:0x0+24+16,3:0x0+540+16,4:0x0-24-48,5:0x0+540-48"
 XDM_XFREQ_GUI_PID=/var/run/xdm-xfreq-gui.pid
 
 # PowerOff
diff --git a/xdm-xfreq.service b/xdm-xfreq.service
index 8cfcbcd479bf..cc3f3c316d32 100644
--- a/xdm-xfreq.service
+++ b/xdm-xfreq.service
@@ -4,7 +4,7 @@ After=systemd-user-sessions.service
 
 [Service]
 ExecStartPre=/usr/lib/systemd/scripts/xdm-xfreq-xdesktops /usr/share/xsessions 1
-ExecStart=/usr/bin/xdm -nodaemon -config /etc/X11/xdm/xdm-xfreq/xdm-config
+ExecStart=/usr/bin/xdm -nodaemon -config /etc/xdm-xfreq/xdm-config
 ExecStopPost=/usr/bin/rm -f /var/run/xdm-xfreq-buttons.pid /var/run/xdm-xfreq-clock.pid /var/run/xdm-xfreq-gui.pid /var/run/xdm-xfreq-xdesktops
 
 [Install]