diff --git a/fhem/contrib/init-scripts/fhem.1 b/fhem/contrib/init-scripts/fhem.1 index c691d9a0f..c7e851fe3 100755 --- a/fhem/contrib/init-scripts/fhem.1 +++ b/fhem/contrib/init-scripts/fhem.1 @@ -5,12 +5,12 @@ # Written by Stefan Manteuffel PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin -DAEMON=/usr/local/bin/fhem.pl +DAEMON=/usr/bin/fhem.pl PIDFILE=/var/run/fhem.pid # Arguments to atd # -ARGS="/etc/FHZ/fhem.cfg" +ARGS="/etc/fhem.cfg" test -x $DAEMON || exit 0 diff --git a/fhem/contrib/rolwzo_not_off.sh b/fhem/contrib/rolwzo_not_off.sh index c3076888f..c72921c64 100755 --- a/fhem/contrib/rolwzo_not_off.sh +++ b/fhem/contrib/rolwzo_not_off.sh @@ -8,7 +8,7 @@ # define rolzwo_not_off notify rolwzo /usr/local/bin/rolwzo_not_off.sh -FHZ="/usr/local/bin/fhem.pl 7072" +FHZ="/usr/bin/fhem.pl 7072" order="delete rolwzo_off" DATESTRING=`date +"%H"` diff --git a/fhem/contrib/rotateShiftWork/rotateShiftWork.sh b/fhem/contrib/rotateShiftWork/rotateShiftWork.sh index 68cfcbe2a..44c00fe7b 100755 --- a/fhem/contrib/rotateShiftWork/rotateShiftWork.sh +++ b/fhem/contrib/rotateShiftWork/rotateShiftWork.sh @@ -43,7 +43,7 @@ even=(08:30 11:30 16:30 22:30) # (from1 to1 from2 to2) free=(08:30 23:50 24:00 24:00) # define fhem.pl host:port -FHEM_BIN="/usr/local/bin/fhem.pl localhost:7072" +FHEM_BIN="/usr/bin/fhem.pl localhost:7072" # define file for rotation WEEKFILE="/var/fhem/week.save" diff --git a/fhem/docs/HOWTO.html b/fhem/docs/HOWTO.html index 06ed8e68d..868d0fd75 100644 --- a/fhem/docs/HOWTO.html +++ b/fhem/docs/HOWTO.html @@ -50,12 +50,12 @@ First install the Device::SerialPort (or Win32::SerialPort) perl module with the command "sudo cpan Device::SerialPort"
The default configuration will install fhem into /usr/bin, - /usr/share/fhem and /var/log/fhem. Edit the Makefile to change - this. + /usr/share/fhem and /var/log/fhem and /etc/fhem.cfg. Edit the Makefile to + change this. To install & start fhem type:
       make install-pgm2
-      perl /usr/local/bin/fhem.pl /var/log/fhem/fhem.cfg
+ perl /usr/bin/fhem.pl /etc/fhem.cfg After starting, the logfile should look like:
       2008.06.15 16:17:03 2: FHEMWEB port 8083 opened
diff --git a/fhem/docs/commandref.html b/fhem/docs/commandref.html
index e8486bc90..3068a6135 100644
--- a/fhem/docs/commandref.html
+++ b/fhem/docs/commandref.html
@@ -176,7 +176,7 @@ A minimal configuration file: 
     attr global statefile /tmp/fhem.save
     attr global verbose 3
     attr global port 7072
-    attr global modpath /usr/local/lib
+    attr global modpath /usr/share/fhem
     define FHZ FHZ /dev/tts/USB0
 
     define lamp FS20 8765 01
diff --git a/fhem/examples/02_fs20 b/fhem/examples/02_fs20 index ad5e69ec2..05f453e8d 100644 --- a/fhem/examples/02_fs20 +++ b/fhem/examples/02_fs20 @@ -63,7 +63,7 @@ quit # Ignore the rest of this file # instead. # -fhem=/usr/local/bin/fhem.pl +fhem=/usr/bin/fhem.pl if test $1 = "on"; then $fhem 7072 "set roll1 on-for-timer 10" diff --git a/fhem/examples/07_sunset_windowed b/fhem/examples/07_sunset_windowed index 5a3c4cc6d..0c0d93498 100755 --- a/fhem/examples/07_sunset_windowed +++ b/fhem/examples/07_sunset_windowed @@ -70,7 +70,7 @@ attr global statefile /tmp/fhem.save attr global pidfilename /var/run/fhem.pid attr global verbose 3 attr global port 7072 -attr global modpath /usr/local/libusr/local/lib +attr global modpath /usr/share/fhem # Die Definition des Attributs "freigabe" # definition of attribute "freigabe"