Merge pull request #17 from stuwilkins/move_start_script

Move start script into bin.

Makefile.am

@@ -319,6 +319,8 @@ scripts/saver-xsecurelock: scripts/saver-xsecurelock.in
 autostart/xsecurelock.desktop: autostart/xsecurelock.desktop.in
 	$(SED) \
 		-e 's|[@]libexecdir@|$(libexecdir)|g' \
+		-e 's|[@]bindir@|$(bindir)|g' \
+		-e 's|[@]sysconfdir@|$(sysconfdir)|g' \
 		< "$<" > "$@"
 
 if BANNER
@@ -330,15 +332,18 @@ endif
 
 autolockdir = $(pkglibexecdir)
 autolock_SCRIPTS = \
-	scripts/run-xsecurelock \
 	scripts/saver-xsecurelock
 
+runscriptdir = $(bindir)
+runscript_SCRIPTS = \
+	scripts/run-xsecurelock 
+
 autostartdir = $(sysconfdir)/xdg/autostart
 autostart_DATA = \
 	autostart/xsecurelock.desktop
 
 CLEANFILES += scripts/run-xsecurelock \
-							scripts/saver-xsecurelock
+			  scripts/saver-xsecurelock
 
 xsecurelocksysconfdir=$(sysconfdir)/xsecurelock
 xsecurelocksysconf_DATA = config/config

autostart/xsecurelock.desktop.in

@@ -2,6 +2,6 @@
 Type=Application
 Name=xsecurelock-nsls2
 NoDisplay=true
-Exec=@libexecdir@/xsecurelock/run-xsecurelock
+Exec=@bindir@/run-xsecurelock
 Terminal=false
 X-GNOME-AutoRestart=true

xsecurelock-nsls2.spec

@@ -60,6 +60,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 %files
 %{_bindir}/xsecurelock
+%{_bindir}/run-xsecurelock
 %{_sysconfdir}/xdg/autostart/xsecurelock.desktop
 %config %{_sysconfdir}/xsecurelock/banner
 %config(noreplace) %{_sysconfdir}/pam.d/xsecurelock-nsls2
@@ -72,7 +73,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{_libexecdir}/xsecurelock/authproto_pam
 %{_libexecdir}/xsecurelock/dimmer
 %{_libexecdir}/xsecurelock/pgrp_placeholder
-%{_libexecdir}/xsecurelock/run-xsecurelock
 %{_libexecdir}/xsecurelock/saver-xsecurelock
 %{_libexecdir}/xsecurelock/saver_blank
 %{_libexecdir}/xsecurelock/saver_multiplex