diff --git a/scripts/Makefile.am b/scripts/Makefile.am index d3d0153..1f2ebe2 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -EXTRA_DIST = init-LCDd.debian.in init-LCDd.rpm.in init-lcdproc.debian.in init-lcdproc.rpm.in lcdproc.conf debian +EXTRA_DIST = init-LCDd.debian.in init-LCDd.rpm.in init-lcdproc.debian.in init-lcdproc.rpm.in debian dist-hook: rm -rf `find $(distdir)/debian -name CVS` diff --git a/scripts/init-lcdproc.debian.in b/scripts/init-lcdproc.debian.in index f3a2fba..c0a3764 100644 --- a/scripts/init-lcdproc.debian.in +++ b/scripts/init-lcdproc.debian.in @@ -24,12 +24,6 @@ lcdproc=${bindir}/lcdproc test -x ${lcdproc} || exit 0 -if [ -f /etc/lcdproc.conf ]; then - . /etc/lcdproc.conf -else - SCREENS="C X" -fi - case "$1" in start) diff --git a/scripts/init-lcdproc.rpm.in b/scripts/init-lcdproc.rpm.in index 580c6d9..1d8741a 100644 --- a/scripts/init-lcdproc.rpm.in +++ b/scripts/init-lcdproc.rpm.in @@ -50,12 +50,6 @@ lcdproc=${bindir}/lcdproc [ -x ${lcdproc} ] || exit 0 -if [ -f /etc/lcdproc.conf ]; then - . /etc/lcdproc.conf -else - SCREENS="C X" -fi - start() { echo -n "Starting up lcdproc: " diff --git a/scripts/lcdproc.conf b/scripts/lcdproc.conf deleted file mode 100644 index f71dfcb..0000000 --- a/scripts/lcdproc.conf +++ /dev/null @@ -1,9 +0,0 @@ -# /etc/lcdproc.conf -# -# Configuration file of the main LCDproc client "lcdproc" -# NOTE: The configuration file of LCDd is /etc/LCDd.conf - -# Set SCREENS to the screens you want lcdproc to send to LCDd -# lcdproc --help will give you a list of the screens available - -SCREENS="C X"