moved include-files

svn path=/gentoo-vdr-scripts/trunk/; revision=121

9 files changed, 19 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 2d8bfd1..8ff40fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for gentoo-vdr-scripts
 
   05 Jan 2006; Matthias Schwarzott <zzam@gentoo.org>
+  usr/lib/vdr/rcscript/pre-start-50-shutdown.sh, Makefile,
+  etc/init.d/vdr, usr/lib/vdr/bin/vdrshutdown-gate.sh,
+  usr/lib/vdr/bin/vdrshutdown-periodic-thread.sh,
+  usr/lib/vdr/bin/vdrshutdown-really.sh,
+  +usr/lib/vdr/inc/shutdown-functions.sh,
+  -usr/lib/vdr/rcscript/functions-shutdown.sh
+  +usr/lib/vdr/inc/rc-functions.sh
+  --usr/lib/vdr/rcscript/functions.sh:
+  moved include-files
+
+  05 Jan 2006; Matthias Schwarzott <zzam@gentoo.org>
   usr/lib/vdr/rcscript/pre-start-50-shutdown.sh:
   Make it clearer how to get more shutdown/wakeup-methods.
 
diff --git a/Makefile b/Makefile
index 1236d58..d4a2aa0 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,9 @@ install:
 	install -m 0644 -o root -g root usr/lib/vdr/shutdown/{shutdown,pre,periodic}*.sh $(DESTDIR)/usr/lib/vdr/shutdown/
 	install -m 0644 -o root -g root usr/lib/vdr/shutdown/wakeup-acpi.sh $(DESTDIR)/usr/lib/vdr/shutdown/
 
+	mkdir -p $(DESTDIR)/usr/lib/vdr/inc
+	install -m 0644 -o root -g root usr/lib/vdr/inc/*.sh $(DESTDIR)/usr/lib/vdr/inc/
+	
 	mkdir -p $(DESTDIR)/usr/lib/vdr/record
 	install -m 0644 -o root -g root usr/lib/vdr/record/*.sh $(DESTDIR)/usr/lib/vdr/record/
 
diff --git a/etc/init.d/vdr b/etc/init.d/vdr
index 4632f30..030af75 100755
--- a/etc/init.d/vdr
+++ b/etc/init.d/vdr
@@ -4,8 +4,7 @@
 
 opts="${opts} watchdogrestart"
 
-vdr_rcdir=/usr/lib/vdr/rcscript
-source ${vdr_rcdir}/functions.sh
+source /usr/lib/vdr/inc/rc-functions.sh
 
 depend() {
 	use lircd dvbsplash
diff --git a/usr/lib/vdr/bin/vdrshutdown-gate.sh b/usr/lib/vdr/bin/vdrshutdown-gate.sh
index 7e84c76..e8fae42 100644
--- a/usr/lib/vdr/bin/vdrshutdown-gate.sh
+++ b/usr/lib/vdr/bin/vdrshutdown-gate.sh
@@ -11,7 +11,7 @@ SVDRPCMD=/usr/bin/svdrpsend.pl
 NVRAM_WAKEUP=/usr/bin/nvram-wakeup
 HOOKDIR=/usr/lib/vdr/shutdown
 
-source /usr/lib/vdr/rcscript/functions-shutdown.sh
+source /usr/lib/vdr/inc/shutdown-functions.sh
 read_shutdown_config
 
 source /usr/lib/vdr/rcscript/vdr-capabilities.sh
diff --git a/usr/lib/vdr/bin/vdrshutdown-periodic-thread.sh b/usr/lib/vdr/bin/vdrshutdown-periodic-thread.sh
index e331140..4ff292a 100644
--- a/usr/lib/vdr/bin/vdrshutdown-periodic-thread.sh
+++ b/usr/lib/vdr/bin/vdrshutdown-periodic-thread.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source /usr/lib/vdr/rcscript/functions-shutdown.sh
+source /usr/lib/vdr/inc/shutdown-functions.sh
 
 source /usr/lib/vdr/rcscript/vdr-capabilities.sh
 
diff --git a/usr/lib/vdr/bin/vdrshutdown-really.sh b/usr/lib/vdr/bin/vdrshutdown-really.sh
index 6549667..190f511 100644
--- a/usr/lib/vdr/bin/vdrshutdown-really.sh
+++ b/usr/lib/vdr/bin/vdrshutdown-really.sh
@@ -3,7 +3,7 @@
 #   Matthias Schwarzott <zzam@gmx.de>
 #
 
-source /usr/lib/vdr/rcscript/functions-shutdown.sh
+source /usr/lib/vdr/inc/shutdown-functions.sh
 
 if [[ "${UID}" != "0" ]]; then
 	echo "This program should be run as root"
diff --git a/usr/lib/vdr/rcscript/functions.sh b/usr/lib/vdr/inc/rc-functions.sh
index 9b5e246..9b5e246 100644
--- a/usr/lib/vdr/rcscript/functions.sh
+++ b/usr/lib/vdr/inc/rc-functions.sh
diff --git a/usr/lib/vdr/rcscript/functions-shutdown.sh b/usr/lib/vdr/inc/shutdown-functions.sh
index 037a8c6..037a8c6 100644
--- a/usr/lib/vdr/rcscript/functions-shutdown.sh
+++ b/usr/lib/vdr/inc/shutdown-functions.sh
diff --git a/usr/lib/vdr/rcscript/pre-start-50-shutdown.sh b/usr/lib/vdr/rcscript/pre-start-50-shutdown.sh
index 4e62ca1..f05bd53 100644
--- a/usr/lib/vdr/rcscript/pre-start-50-shutdown.sh
+++ b/usr/lib/vdr/rcscript/pre-start-50-shutdown.sh
@@ -16,7 +16,7 @@ shutdown_disabled() {
 }
 
 addon_main() {
-	source /usr/lib/vdr/rcscript/functions-shutdown.sh
+	source /usr/lib/vdr/inc/shutdown-functions.sh
 	read_shutdown_config
 	[[ "${SHUTDOWN_ACTIVE}" == "no" ]] && return