File wview-directories-5.18.1.diff of Package wview

Overview Repositories Revisions Requests Users Attributes Meta

File wview-directories-5.18.1.diff of Package wview (Revision c3cf3a4d7ece0d86ed0a1ad112aa95bf)

Currently displaying revision c3cf3a4d7ece0d86ed0a1ad112aa95bf , Show latest

diff -urN wview-5.18.1/alarms/sample-datafeed-client/Makefile wview-5.18.1-patch/alarms/sample-datafeed-client/Makefile
--- wview-5.18.1/alarms/sample-datafeed-client/Makefile	2009-12-17 06:11:42.000000000 +0200
+++ wview-5.18.1-patch/alarms/sample-datafeed-client/Makefile	2011-03-15 10:34:47.652075954 +0200
@@ -39,7 +39,7 @@
 			-lsqlite3 \
 			-lrad
 
-LIBPATH 		= -L/usr/lib -L/usr/local/lib
+LIBPATH 		= -L/usr/lib -L/usr/lib
 
 # Declare build defines
 DEFINES			= \
@@ -49,7 +49,7 @@
 INCLUDES		= \
 			-I. \
 			-I../../common \
-			-I/usr/local/include
+			-I/usr/include
 
 ########################### T A R G E T I N F O ############################
 EXE_IMAGE		= datafeedClient
diff -urN wview-5.18.1/ChangeLog wview-5.18.1-patch/ChangeLog
--- wview-5.18.1/ChangeLog	2011-03-14 20:34:06.000000000 +0200
+++ wview-5.18.1-patch/ChangeLog	2011-03-15 10:34:47.659075983 +0200
@@ -508,7 +508,7 @@
 
 4) Fixed a bug in htmlHistoryInit which caused the wview-history.sdb database to 
 be filled with NULL records if there was no archive history available. Simply
- delete the $prefix/var/wview/archive/wview-history.sdb file and restart wview.
+ delete the /var/lib/wview/archive/wview-history.sdb file and restart wview.
 
 5) Cleaned up the debian package generation control files including making
 "radlib-dev" a prerequisite for wview. APT upgrades of the 5.8.0 package
@@ -534,7 +534,7 @@
 4) Removed use of the HTTP_DOC_ROOT environment variable. Now the install
 location for wviewmgmt will be $(localstatedir)/wviewmgmt. Soft links can
 be used to make this visible in the http server document root as desired.
- $(localstatedir) is /usr/local/var by default.
+ $(localstatedir) is /var by default.
 
 5) Added new configuration database creation script for debian package
 installations. It is used by the debian package post-installation script.
@@ -853,7 +853,7 @@
 defined prior to invocation of the configure script, the install-env target
 will install wviewmgmt to the http document root specified.
 
-3) Updated the install-env target for wview build so the $prefix/var/wview/archive
+3) Updated the install-env target for wview build so the /var/lib/wview/archive
 directory is NOT replaced, but rather updated. This means your existing archive
 database should be preserved and will not require a manual copy from the save 
 directory after the installation.
@@ -1010,7 +1010,7 @@
 regenerate the sensor store.
 
 6) Removed configurability of the archive path. It will now always be at
- $prefix/var/wview/archive.
+ /var/lib/wview/archive.
 
 7) Autogenerate CWOP passcode for non-CW/DW stations (Gerry Creager).
 
@@ -1068,8 +1068,8 @@
 2) Add rain rate accumulator to the WMR918 station as the reported rain rate
 from the station is inferior.
 
-3) Changed default source location for ftp transfers from $prefix/var/wview
- to $prefix/var/wview/img so by default no "img" directory will be tacked on
+3) Changed default source location for ftp transfers from /var/lib/wview
+ to /var/lib/wview/img so by default no "img" directory will be tacked on
 to the destination directory. This will require all users of ftp to modify 
 their wviewftp.conf file to remove all leading "img" references.
 
@@ -1241,7 +1241,7 @@
 wviewhtmlconfig is run.
 
 8) Changed location of wview configuration and data trees from /etc/wview and
- /var/wview to $prefix/etc/wview and $prefix/var/wview respectively. This
+ /var/lib/wview to $prefix/etc/wview and /var/lib/wview respectively. This
 allows wview to be installed at any prefix specified during the configure 
 process (--prefix=/opt/local for example). Binary files were already being
 installed to $prefix. This allows wview to be installed/run in a chroot jail
@@ -1345,9 +1345,9 @@
 
 1) Added new meta-tag for file inclusion: !--include filename.xxx--. If this 
 tag is found in any template file, then htmlgend will attempt to open the
- file at /var/wview/img/filename.xxx and place its contents in the file
+ file at /var/lib/wview/img/filename.xxx and place its contents in the file
 being generated (if your default output location is different from the
- default location of /var/wview/img, htmlgend will look in your destination
+ default location of /var/lib/wview/img, htmlgend will look in your destination
 folder). Included files can themselves be generated from templates, just
 place them before the template file which includes them in 
 html-templates.conf (htmlgend generates them in the order found in this conf
@@ -1602,11 +1602,11 @@
 html-templates.conf and (if supported) forecast.conf without having to 
 restart wview.
 It can be invoked individually for each process with these commands: 
- kill -s HUP `cat /var/wview/wviewd.pid`
- kill -s HUP `cat /var/wview/htmlgend.pid`
- kill -s HUP `cat /var/wview/wviewftpd.pid`
- kill -s HUP `cat /var/wview/wviewsshd.pid`
- kill -s HUP `cat /var/wview/wvalarmd.pid`
+ kill -s HUP `cat /var/lib/wview/wviewd.pid`
+ kill -s HUP `cat /var/lib/wview/htmlgend.pid`
+ kill -s HUP `cat /var/lib/wview/wviewftpd.pid`
+ kill -s HUP `cat /var/lib/wview/wviewsshd.pid`
+ kill -s HUP `cat /var/lib/wview/wvalarmd.pid`
 
 6) Added FTP configuration ability to specify a relative path from the FTP 
 login directory to which the wview-generated files will be transferred. 
@@ -2814,10 +2814,10 @@
 "__attribute__ ((packed))" on several data structures for more portable 
 code.
 
-3) Abolished the /usr/local/wview directory - now configuration files
+3) Abolished the /usr/share/wview directory - now configuration files
 (*.conf, html templates) are located in /etc/wview and run files
 (*.pid, archive, FIFO devices, images, NOAA) are located in 
- /var/wview. This allows the dynamic files under /var to be mounted
+ /var/lib/wview. This allows the dynamic files under /var to be mounted
 on a ramdisk for embedded applications.
 
 4) Changed the install-env build target to use the new locations. See the 
@@ -2847,7 +2847,7 @@
 The ftpd daemon executable has been renamed "wviewftpd".
 
 All three daemons (wviewd, htmlgend and wviewftpd) are installed
- in /usr/local/bin by default, although the prefix (=/usr/local)
+ in /usr/bin by default, although the prefix (=/usr)
 can be changed when "configure" is invoked.
 
 make.config, rules.make, and Makefiles have been removed from
@@ -2966,8 +2966,8 @@
 of radlib. radlib must now be built separately (and before)
 wview. radlib can now be located anywhere and the env variable
 "RADLIB_SRC_BASE" is no longer required at all. Headers and
- the library file are stored under "/usr/local/include" and
- "/usr/local/lib" respectively. The new radlib version is
+ the library file are stored under "/usr/include" and
+ "/usr/lib" respectively. The new radlib version is
 1.2 and the distro tree is rooted at "radlib-gpl". The README
 file has been updated (and simplified) accordingly.
 3) Added GPL headers and the "COPYING" file which contains the
@@ -3116,7 +3116,7 @@
 --------------------
 
 1) Removed pnggen directory from project - link against system libraries,
- build against /usr/local/include
+ build against /usr/include
 
 
 
diff -urN wview-5.18.1/configure wview-5.18.1-patch/configure
--- wview-5.18.1/configure	2011-03-14 20:46:04.000000000 +0200
+++ wview-5.18.1-patch/configure	2011-03-15 10:34:47.674076332 +0200
@@ -540,7 +540,7 @@
 #
 # Initializations.
 #
-ac_default_prefix=/usr/local
+ac_default_prefix=/usr
 ac_clean_files=
 ac_config_libobj_dir=.
 LIBOBJS=
@@ -2376,7 +2376,7 @@
 # so one script is as good as another. But avoid the broken or
 # incompatible versions:
 # SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
+# SunOS /etc/install
 # IRIX /sbin/install
 # AIX /bin/install
 # AmigaOS /C/install, which installs bootblocks on floppy discs
@@ -2400,7 +2400,7 @@
 # Account for people who put trailing slashes in PATH elements.
 case $as_dir/ in #((
 ./ | .// | /[cC]/* | \
- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+ /etc/* | /usr/sbin/* | /etc/* | /sbin/* | /usr/afsws/bin/* | \
 ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
 /usr/ucb/* ) ;;
 *)
diff -urN wview-5.18.1/cross-compile/config-libgd-arm-linux wview-5.18.1-patch/cross-compile/config-libgd-arm-linux
--- wview-5.18.1/cross-compile/config-libgd-arm-linux	2009-02-05 07:09:30.000000000 +0200
+++ wview-5.18.1-patch/cross-compile/config-libgd-arm-linux	2011-03-15 10:34:47.676076900 +0200
@@ -4,7 +4,7 @@
 ARCH="arm-linux"
 
 # path to the toolchain and kernel base
-TOOL_PATH=/usr/local/arm
+TOOL_PATH=/usr/arm
 
 # path to the toolchain base
 BASE_PATH=$TOOL_PATH/2.95.3
diff -urN wview-5.18.1/cross-compile/config-libpng-arm-linux wview-5.18.1-patch/cross-compile/config-libpng-arm-linux
--- wview-5.18.1/cross-compile/config-libpng-arm-linux	2009-02-05 07:09:30.000000000 +0200
+++ wview-5.18.1-patch/cross-compile/config-libpng-arm-linux	2011-03-15 10:34:47.677076206 +0200
@@ -4,7 +4,7 @@
 ARCH="arm-linux"
 
 # path to the toolchain and kernel base
-TOOL_PATH=/usr/local/arm
+TOOL_PATH=/usr/arm
 
 # path to the toolchain base
 BASE_PATH=$TOOL_PATH/2.95.3
diff -urN wview-5.18.1/cross-compile/config-libz-arm-linux wview-5.18.1-patch/cross-compile/config-libz-arm-linux
--- wview-5.18.1/cross-compile/config-libz-arm-linux	2009-02-05 07:09:30.000000000 +0200
+++ wview-5.18.1-patch/cross-compile/config-libz-arm-linux	2011-03-15 10:34:47.678076070 +0200
@@ -4,7 +4,7 @@
 ARCH="arm-linux"
 
 # path to the toolchain and kernel base
-TOOL_PATH=/usr/local/arm
+TOOL_PATH=/usr/arm
 
 # path to the toolchain base
 BASE_PATH=$TOOL_PATH/2.95.3
diff -urN wview-5.18.1/cross-compile/config-radlib-arm-linux wview-5.18.1-patch/cross-compile/config-radlib-arm-linux
--- wview-5.18.1/cross-compile/config-radlib-arm-linux	2009-12-30 17:46:07.000000000 +0200
+++ wview-5.18.1-patch/cross-compile/config-radlib-arm-linux	2011-03-15 10:34:47.679076353 +0200
@@ -5,7 +5,7 @@
 VERSION="4.2.4"
 
 # path to the toolchain and kernel base
-TOOL_PATH=/usr/local/arm_9263
+TOOL_PATH=/usr/arm_9263
 
 # path to the toolchain base
 BASE_PATH=$TOOL_PATH/usr
diff -urN wview-5.18.1/cross-compile/config-wview-arm-linux wview-5.18.1-patch/cross-compile/config-wview-arm-linux
--- wview-5.18.1/cross-compile/config-wview-arm-linux	2009-12-30 18:21:38.000000000 +0200
+++ wview-5.18.1-patch/cross-compile/config-wview-arm-linux	2011-03-15 10:34:47.680076079 +0200
@@ -5,7 +5,7 @@
 VERSION="2.95.3"
 
 # path to the toolchain and kernel base
-TOOL_PATH=/usr/local/arm
+TOOL_PATH=/usr/arm
 
 # path to the toolchain base
 BASE_PATH=$TOOL_PATH/$VERSION
diff -urN wview-5.18.1/dbexport/wview-mysql-create.sh wview-5.18.1-patch/dbexport/wview-mysql-create.sh
--- wview-5.18.1/dbexport/wview-mysql-create.sh	2009-04-05 18:28:18.000000000 +0300
+++ wview-5.18.1-patch/dbexport/wview-mysql-create.sh	2011-03-15 10:34:47.681075735 +0200
@@ -46,7 +46,7 @@
 
 ## DO NOT CHANGE ANY DEFS IN THIS BLOCK!
 
-export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+export PATH=/usr/sbin:/usr/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 ## The defaults match the SQLite table names: 
 SQL_ARCHIVE_TABLE=archive
diff -urN wview-5.18.1/dbexport/wview-mysql-export.sh wview-5.18.1-patch/dbexport/wview-mysql-export.sh
--- wview-5.18.1/dbexport/wview-mysql-export.sh	2009-04-04 21:16:50.000000000 +0300
+++ wview-5.18.1-patch/dbexport/wview-mysql-export.sh	2011-03-15 10:34:47.683075953 +0200
@@ -31,7 +31,7 @@
 
 ## DO NOT CHANGE ANY DEFS IN THIS BLOCK!
 
-export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+export PATH=/usr/sbin:/usr/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 SECONDS_IN_DAY=86400
 SECONDS_IN_HOUR=3600
diff -urN wview-5.18.1/dbexport/wview-pgsql-create.sh wview-5.18.1-patch/dbexport/wview-pgsql-create.sh
--- wview-5.18.1/dbexport/wview-pgsql-create.sh	2009-04-15 06:24:52.000000000 +0300
+++ wview-5.18.1-patch/dbexport/wview-pgsql-create.sh	2011-03-15 10:34:47.685075961 +0200
@@ -34,7 +34,7 @@
 
 ## DO NOT CHANGE ANY DEFS IN THIS BLOCK!
 
-export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+export PATH=/usr/sbin:/usr/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 ## The defaults match the SQLite table names: 
 SQL_ARCHIVE_TABLE=archive
diff -urN wview-5.18.1/dbexport/wview-pgsql-export.sh wview-5.18.1-patch/dbexport/wview-pgsql-export.sh
--- wview-5.18.1/dbexport/wview-pgsql-export.sh	2009-04-15 01:45:12.000000000 +0300
+++ wview-5.18.1-patch/dbexport/wview-pgsql-export.sh	2011-03-15 10:34:47.687076181 +0200
@@ -26,7 +26,7 @@
 
 ## DO NOT CHANGE ANY DEFS IN THIS BLOCK!
 
-export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+export PATH=/usr/sbin:/usr/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 SECONDS_IN_DAY=86400
 SECONDS_IN_HOUR=3600
diff -urN wview-5.18.1/debian/init.d wview-5.18.1-patch/debian/init.d
--- wview-5.18.1/debian/init.d	2009-12-26 16:57:20.000000000 +0200
+++ wview-5.18.1-patch/debian/init.d	2011-03-15 10:34:47.688075976 +0200
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # add to the shared library search path
-export LD_LIBRARY_PATH=/lib:/usr/local/lib:/usr/lib
+export LD_LIBRARY_PATH=/lib:/usr/lib:/usr/lib
 CONF_DIRECTORY=/etc/wview
 RUN_DIRECTORY=/var/lib/wview
 WVIEW_INSTALL_DIR=/usr/bin
@@ -15,7 +15,7 @@
 # Description: Start wview daemons at boot time.
 ### END INIT INFO
 # config: $prefix/etc/wview
-# pidfiles: $prefix/var/wview/*.pid
+# pidfiles: /var/lib/wview/*.pid
 ################################################################################
 
 WVIEWD_FILE=`cat $CONF_DIRECTORY/wview-binary`
diff -urN wview-5.18.1/debian/postinst wview-5.18.1-patch/debian/postinst
--- wview-5.18.1/debian/postinst	2010-01-31 16:48:14.000000000 +0200
+++ wview-5.18.1-patch/debian/postinst	2011-03-15 10:34:47.689076260 +0200
@@ -28,8 +28,8 @@
 mkdir -p /var/lib/wview/img/Archive
 mkdir -p /var/lib/wview/img/NOAA
 mkdir -p /var/lib/wview/archive
- cp -fp /usr/share/wview/var/wview/img/*.* /var/lib/wview/img
- cp -fp /usr/share/wview/var/wview/archive/* /var/lib/wview/archive
+ cp -fp /usr/share/wview/var/lib/wview/img/*.* /var/lib/wview/img
+ cp -fp /usr/share/wview/var/lib/wview/archive/* /var/lib/wview/archive
 /usr/bin/sqlite3 /var/lib/wview/archive/wview-archive.sdb '.read /var/lib/wview/archive/wview-archive.sql'
 echo "==> /var/lib/wview has been created with distro examples"
 else
diff -urN wview-5.18.1/debian/wlk2sqlite.1 wview-5.18.1-patch/debian/wlk2sqlite.1
--- wview-5.18.1/debian/wlk2sqlite.1	2009-11-28 19:32:04.000000000 +0200
+++ wview-5.18.1-patch/debian/wlk2sqlite.1	2011-03-15 10:34:47.690076403 +0200
@@ -26,7 +26,7 @@
 .B wlk2sqlite
 .
 Convert WLK archive file data in source_directory to SQLite3 format in 
-[destination_directory]/wview-archive.sdb or to $localstatedir/var/wview/archive/wview-archive.sdb 
+[destination_directory]/wview-archive.sdb or to $localstatedir/var/lib/wview/archive/wview-archive.sdb 
 if [destination_directory] is not given. Only unique records will be inserted.
 .BR Note: Must be run as root if [destination_directory] is not given.
 .BR Note: source_directory can be the same as [destination_directory].
diff -urN wview-5.18.1/examples/alarms/outtempMax.sh wview-5.18.1-patch/examples/alarms/outtempMax.sh
--- wview-5.18.1/examples/alarms/outtempMax.sh	2009-10-30 06:42:58.000000000 +0200
+++ wview-5.18.1-patch/examples/alarms/outtempMax.sh	2011-03-15 10:34:47.691083182 +0200
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-mkdir -p /usr/local/var/wview/alarms
-echo "`date`:OutTempMax: type $1, threshold $2, trigger $3" >> /usr/local/var/wview/alarms/alarm.log
+mkdir -p /var/lib/wview/alarms
+echo "`date`:OutTempMax: type $1, threshold $2, trigger $3" >> /var/lib/wview/alarms/alarm.log
 
diff -urN wview-5.18.1/examples/alarms/outtempMin.sh wview-5.18.1-patch/examples/alarms/outtempMin.sh
--- wview-5.18.1/examples/alarms/outtempMin.sh	2009-10-30 06:42:58.000000000 +0200
+++ wview-5.18.1-patch/examples/alarms/outtempMin.sh	2011-03-15 10:34:47.693076208 +0200
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-mkdir -p /usr/local/var/wview/alarms
-echo "`date`:OutTempMin: type $1, threshold $2, trigger $3" >> /usr/local/var/wview/alarms/alarm.log
+mkdir -p /var/lib/wview/alarms
+echo "`date`:OutTempMin: type $1, threshold $2, trigger $3" >> /var/lib/wview/alarms/alarm.log
 
diff -urN wview-5.18.1/examples/conf/wview-conf.sql wview-5.18.1-patch/examples/conf/wview-conf.sql
--- wview-5.18.1/examples/conf/wview-conf.sql	2011-03-11 01:22:22.000000000 +0200
+++ wview-5.18.1-patch/examples/conf/wview-conf.sql	2011-03-15 10:34:47.695076077 +0200
@@ -36,8 +36,8 @@
 INSERT INTO "config" VALUES('HTMLGEN_STATION_NAME','changeme','Station Name:','ENABLE_HTMLGEN');
 INSERT INTO "config" VALUES('HTMLGEN_STATION_CITY','changeme','Station City:','ENABLE_HTMLGEN');
 INSERT INTO "config" VALUES('HTMLGEN_STATION_STATE','changeme','Station State:','ENABLE_HTMLGEN');
-INSERT INTO "config" VALUES('HTMLGEN_IMAGE_PATH','/usr/local/var/wview/img','Where to store generated html and graphics files:','ENABLE_HTMLGEN');
-INSERT INTO "config" VALUES('HTMLGEN_HTML_PATH','/usr/local/etc/wview/html','Where to find HTML template files:','ENABLE_HTMLGEN');
+INSERT INTO "config" VALUES('HTMLGEN_IMAGE_PATH','/var/lib/wview/img','Where to store generated html and graphics files:','ENABLE_HTMLGEN');
+INSERT INTO "config" VALUES('HTMLGEN_HTML_PATH','/etc/wview/html','Where to find HTML template files:','ENABLE_HTMLGEN');
 INSERT INTO "config" VALUES('HTMLGEN_START_OFFSET','0','Generation start offset (0-4) in minutes:','ENABLE_HTMLGEN');
 INSERT INTO "config" VALUES('HTMLGEN_GENERATE_INTERVAL','1','How often to generate (refresh interval for your site data) in minutes:','ENABLE_HTMLGEN');
 INSERT INTO "config" VALUES('HTMLGEN_METRIC_UNITS','no','Enable metric conversion/units?','ENABLE_HTMLGEN');
@@ -58,7 +58,7 @@
 INSERT INTO "config" VALUES('ALARMS_1_MAX','no','Is this an upper bound alarm?','ENABLE_ALARMS');
 INSERT INTO "config" VALUES('ALARMS_1_THRESHOLD','0','Upper/lower bound value (threshold) (float or integer):','ENABLE_ALARMS');
 INSERT INTO "config" VALUES('ALARMS_1_ABATEMENT','600','Number of seconds to suppress alarms after an alarm triggers:','ENABLE_ALARMS');
-INSERT INTO "config" VALUES('ALARMS_1_EXECUTE','/usr/local/etc/wview/alarms/your-alarm.sh','Full path to the shell script or binary to execute when the alarm triggers:','ENABLE_ALARMS');
+INSERT INTO "config" VALUES('ALARMS_1_EXECUTE','/etc/wview/alarms/your-alarm.sh','Full path to the shell script or binary to execute when the alarm triggers:','ENABLE_ALARMS');
 INSERT INTO "config" VALUES('ALARMS_2_TYPE','0','(2 of 10) Alarm Type (see the User Manual file for valid types):','ENABLE_ALARMS');
 INSERT INTO "config" VALUES('ALARMS_2_MAX','no','Is this an upper bound alarm?','ENABLE_ALARMS');
 INSERT INTO "config" VALUES('ALARMS_2_THRESHOLD','0','Upper/lower bound value (threshold) (float or integer):','ENABLE_ALARMS');
@@ -110,41 +110,41 @@
 INSERT INTO "config" VALUES('FTP_REMOTE_DIRECTORY','','Optional Remote Transfer Directory (relative to the ftp login directory, no leading ''/''):','ENABLE_FTP');
 INSERT INTO "config" VALUES('FTP_USE_PASSIVE','yes','Use EPSV FTP transfer mode (if supported):','ENABLE_FTP');
 INSERT INTO "config" VALUES('FTP_INTERVAL','5','Global transmit interval (mins):','ENABLE_FTP');
-INSERT INTO "config" VALUES('FTP_RULE_1_SOURCE','*.*','(1 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP');
-INSERT INTO "config" VALUES('FTP_RULE_2_SOURCE','Archive/*.txt','(2 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP');
-INSERT INTO "config" VALUES('FTP_RULE_3_SOURCE','NOAA/*.txt','(3 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP');
-INSERT INTO "config" VALUES('FTP_RULE_4_SOURCE','','(4 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP');
-INSERT INTO "config" VALUES('FTP_RULE_5_SOURCE','','(5 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP');
-INSERT INTO "config" VALUES('FTP_RULE_6_SOURCE','','(6 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP');
-INSERT INTO "config" VALUES('FTP_RULE_7_SOURCE','','(7 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP');
-INSERT INTO "config" VALUES('FTP_RULE_8_SOURCE','','(8 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP');
-INSERT INTO "config" VALUES('FTP_RULE_9_SOURCE','','(9 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP');
-INSERT INTO "config" VALUES('FTP_RULE_10_SOURCE','','(10 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP');
-INSERT INTO "config" VALUES('SSH_1_SOURCE','/usr/local/var/wview/img','(1 of 5) Local Source directory (normally $prefix/var/wview/img):','ENABLE_SSH');
+INSERT INTO "config" VALUES('FTP_RULE_1_SOURCE','*.*','(1 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP');
+INSERT INTO "config" VALUES('FTP_RULE_2_SOURCE','Archive/*.txt','(2 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP');
+INSERT INTO "config" VALUES('FTP_RULE_3_SOURCE','NOAA/*.txt','(3 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP');
+INSERT INTO "config" VALUES('FTP_RULE_4_SOURCE','','(4 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP');
+INSERT INTO "config" VALUES('FTP_RULE_5_SOURCE','','(5 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP');
+INSERT INTO "config" VALUES('FTP_RULE_6_SOURCE','','(6 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP');
+INSERT INTO "config" VALUES('FTP_RULE_7_SOURCE','','(7 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP');
+INSERT INTO "config" VALUES('FTP_RULE_8_SOURCE','','(8 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP');
+INSERT INTO "config" VALUES('FTP_RULE_9_SOURCE','','(9 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP');
+INSERT INTO "config" VALUES('FTP_RULE_10_SOURCE','','(10 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP');
+INSERT INTO "config" VALUES('SSH_1_SOURCE','/var/lib/wview/img','(1 of 5) Local Source directory (normally /var/lib/wview/img):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_1_INTERVAL','1','How often to synchronize the remote server (minutes):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_1_HOST','remotehost.net','Remote Host (hostname or IP address):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_1_PORT','22','SSH Port Number:','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_1_USERNAME','','Remote SSH username:','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_1_DESTINATION','http/wview','Remote destination path, relative to the root ssh login directory (no leading ''/''):','ENABLE_SSH');
-INSERT INTO "config" VALUES('SSH_2_SOURCE','','(2 of 5) Local Source directory (normally $prefix/var/wview/img):','ENABLE_SSH');
+INSERT INTO "config" VALUES('SSH_2_SOURCE','','(2 of 5) Local Source directory (normally /var/lib/wview/img):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_2_INTERVAL','0','How often to synchronize the remote server (minutes):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_2_HOST','','Remote Host (hostname or IP address):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_2_PORT','22','SSH Port Number:','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_2_USERNAME','','Remote SSH username:','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_2_DESTINATION','','Remote destination path, relative to the root ssh login directory (no leading ''/''):','ENABLE_SSH');
-INSERT INTO "config" VALUES('SSH_3_SOURCE','','(3 of 5) Local Source directory (normally $prefix/var/wview/img):','ENABLE_SSH');
+INSERT INTO "config" VALUES('SSH_3_SOURCE','','(3 of 5) Local Source directory (normally /var/lib/wview/img):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_3_INTERVAL','0','How often to synchronize the remote server (minutes):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_3_HOST','','Remote Host (hostname or IP address):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_3_PORT','22','SSH Port Number:','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_3_USERNAME','','Remote SSH username:','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_3_DESTINATION','','Remote destination path, relative to the root ssh login directory (no leading ''/''):','ENABLE_SSH');
-INSERT INTO "config" VALUES('SSH_4_SOURCE','','(4 of 5) Local Source directory (normally $prefix/var/wview/img):','ENABLE_SSH');
+INSERT INTO "config" VALUES('SSH_4_SOURCE','','(4 of 5) Local Source directory (normally /var/lib/wview/img):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_4_INTERVAL','0','How often to synchronize the remote server (minutes):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_4_HOST','','Remote Host (hostname or IP address):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_4_PORT','22','SSH Port Number:','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_4_USERNAME','','Remote SSH username:','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_4_DESTINATION','','Remote destination path, relative to the root ssh login directory (no leading ''/''):','ENABLE_SSH');
-INSERT INTO "config" VALUES('SSH_5_SOURCE','','(5 of 5) Local Source directory (normally $prefix/var/wview/img):','ENABLE_SSH');
+INSERT INTO "config" VALUES('SSH_5_SOURCE','','(5 of 5) Local Source directory (normally /var/lib/wview/img):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_5_INTERVAL','0','How often to synchronize the remote server (minutes):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_5_HOST','','Remote Host (hostname or IP address):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_5_PORT','22','SSH Port Number:','ENABLE_SSH');
diff -urN wview-5.18.1/examples/conf/wview-conf.sql-deb-pkg wview-5.18.1-patch/examples/conf/wview-conf.sql-deb-pkg
--- wview-5.18.1/examples/conf/wview-conf.sql-deb-pkg	2011-03-11 01:22:31.000000000 +0200
+++ wview-5.18.1-patch/examples/conf/wview-conf.sql-deb-pkg	2011-03-15 10:34:47.698076369 +0200
@@ -110,41 +110,41 @@
 INSERT INTO "config" VALUES('FTP_REMOTE_DIRECTORY','','Optional Remote Transfer Directory (relative to the ftp login directory, no leading ''/''):','ENABLE_FTP');
 INSERT INTO "config" VALUES('FTP_USE_PASSIVE','yes','Use EPSV FTP transfer mode (if supported):','ENABLE_FTP');
 INSERT INTO "config" VALUES('FTP_INTERVAL','5','Global transmit interval (mins):','ENABLE_FTP');
-INSERT INTO "config" VALUES('FTP_RULE_1_SOURCE','*.*','(1 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP');
-INSERT INTO "config" VALUES('FTP_RULE_2_SOURCE','Archive/*.txt','(2 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP');
-INSERT INTO "config" VALUES('FTP_RULE_3_SOURCE','NOAA/*.txt','(3 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP');
-INSERT INTO "config" VALUES('FTP_RULE_4_SOURCE','','(4 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP');
-INSERT INTO "config" VALUES('FTP_RULE_5_SOURCE','','(5 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP');
-INSERT INTO "config" VALUES('FTP_RULE_6_SOURCE','','(6 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP');
-INSERT INTO "config" VALUES('FTP_RULE_7_SOURCE','','(7 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP');
-INSERT INTO "config" VALUES('FTP_RULE_8_SOURCE','','(8 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP');
-INSERT INTO "config" VALUES('FTP_RULE_9_SOURCE','','(9 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP');
-INSERT INTO "config" VALUES('FTP_RULE_10_SOURCE','','(10 of 10) Source file (relative to $prefix/var/wview/img):','ENABLE_FTP');
-INSERT INTO "config" VALUES('SSH_1_SOURCE','/usr/local/var/wview/img','(1 of 5) Local Source directory (normally $prefix/var/wview/img):','ENABLE_SSH');
+INSERT INTO "config" VALUES('FTP_RULE_1_SOURCE','*.*','(1 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP');
+INSERT INTO "config" VALUES('FTP_RULE_2_SOURCE','Archive/*.txt','(2 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP');
+INSERT INTO "config" VALUES('FTP_RULE_3_SOURCE','NOAA/*.txt','(3 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP');
+INSERT INTO "config" VALUES('FTP_RULE_4_SOURCE','','(4 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP');
+INSERT INTO "config" VALUES('FTP_RULE_5_SOURCE','','(5 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP');
+INSERT INTO "config" VALUES('FTP_RULE_6_SOURCE','','(6 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP');
+INSERT INTO "config" VALUES('FTP_RULE_7_SOURCE','','(7 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP');
+INSERT INTO "config" VALUES('FTP_RULE_8_SOURCE','','(8 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP');
+INSERT INTO "config" VALUES('FTP_RULE_9_SOURCE','','(9 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP');
+INSERT INTO "config" VALUES('FTP_RULE_10_SOURCE','','(10 of 10) Source file (relative to /var/lib/wview/img):','ENABLE_FTP');
+INSERT INTO "config" VALUES('SSH_1_SOURCE','/var/lib/wview/img','(1 of 5) Local Source directory (normally /var/lib/wview/img):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_1_INTERVAL','1','How often to synchronize the remote server (minutes):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_1_HOST','remotehost.net','Remote Host (hostname or IP address):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_1_PORT','22','SSH Port Number:','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_1_USERNAME','','Remote SSH username:','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_1_DESTINATION','http/wview','Remote destination path, relative to the root ssh login directory (no leading ''/''):','ENABLE_SSH');
-INSERT INTO "config" VALUES('SSH_2_SOURCE','','(2 of 5) Local Source directory (normally $prefix/var/wview/img):','ENABLE_SSH');
+INSERT INTO "config" VALUES('SSH_2_SOURCE','','(2 of 5) Local Source directory (normally /var/lib/wview/img):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_2_INTERVAL','0','How often to synchronize the remote server (minutes):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_2_HOST','','Remote Host (hostname or IP address):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_2_PORT','22','SSH Port Number:','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_2_USERNAME','','Remote SSH username:','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_2_DESTINATION','','Remote destination path, relative to the root ssh login directory (no leading ''/''):','ENABLE_SSH');
-INSERT INTO "config" VALUES('SSH_3_SOURCE','','(3 of 5) Local Source directory (normally $prefix/var/wview/img):','ENABLE_SSH');
+INSERT INTO "config" VALUES('SSH_3_SOURCE','','(3 of 5) Local Source directory (normally /var/lib/wview/img):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_3_INTERVAL','0','How often to synchronize the remote server (minutes):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_3_HOST','','Remote Host (hostname or IP address):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_3_PORT','22','SSH Port Number:','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_3_USERNAME','','Remote SSH username:','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_3_DESTINATION','','Remote destination path, relative to the root ssh login directory (no leading ''/''):','ENABLE_SSH');
-INSERT INTO "config" VALUES('SSH_4_SOURCE','','(4 of 5) Local Source directory (normally $prefix/var/wview/img):','ENABLE_SSH');
+INSERT INTO "config" VALUES('SSH_4_SOURCE','','(4 of 5) Local Source directory (normally /var/lib/wview/img):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_4_INTERVAL','0','How often to synchronize the remote server (minutes):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_4_HOST','','Remote Host (hostname or IP address):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_4_PORT','22','SSH Port Number:','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_4_USERNAME','','Remote SSH username:','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_4_DESTINATION','','Remote destination path, relative to the root ssh login directory (no leading ''/''):','ENABLE_SSH');
-INSERT INTO "config" VALUES('SSH_5_SOURCE','','(5 of 5) Local Source directory (normally $prefix/var/wview/img):','ENABLE_SSH');
+INSERT INTO "config" VALUES('SSH_5_SOURCE','','(5 of 5) Local Source directory (normally /var/lib/wview/img):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_5_INTERVAL','0','How often to synchronize the remote server (minutes):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_5_HOST','','Remote Host (hostname or IP address):','ENABLE_SSH');
 INSERT INTO "config" VALUES('SSH_5_PORT','22','SSH Port Number:','ENABLE_SSH');
diff -urN wview-5.18.1/examples/Debian/Makefile.am wview-5.18.1-patch/examples/Debian/Makefile.am
--- wview-5.18.1/examples/Debian/Makefile.am	2009-11-28 19:32:06.000000000 +0200
+++ wview-5.18.1-patch/examples/Debian/Makefile.am	2011-03-15 10:34:47.699083217 +0200
@@ -11,7 +11,7 @@
 	-echo "#!/bin/bash" > wview
 	echo "" >> wview
 	echo "# add to the shared library search path" >> wview
-	echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/local/lib:/usr/lib" >> wview
+	echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/lib:/usr/lib" >> wview
 	echo "CONF_DIRECTORY=$(sysconfdir)/wview" >> wview
 	echo "RUN_DIRECTORY=$(localstatedir)/wview" >> wview
 	echo "WVIEW_INSTALL_DIR=$(exec_prefix)/bin" >> wview
diff -urN wview-5.18.1/examples/Debian/Makefile.in wview-5.18.1-patch/examples/Debian/Makefile.in
--- wview-5.18.1/examples/Debian/Makefile.in	2011-03-14 20:46:01.000000000 +0200
+++ wview-5.18.1-patch/examples/Debian/Makefile.in	2011-03-15 10:34:47.701075825 +0200
@@ -337,7 +337,7 @@
 	-echo "#!/bin/bash" > wview
 	echo "" >> wview
 	echo "# add to the shared library search path" >> wview
-	echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/local/lib:/usr/lib" >> wview
+	echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/lib:/usr/lib" >> wview
 	echo "CONF_DIRECTORY=$(sysconfdir)/wview" >> wview
 	echo "RUN_DIRECTORY=$(localstatedir)/wview" >> wview
 	echo "WVIEW_INSTALL_DIR=$(exec_prefix)/bin" >> wview
diff -urN wview-5.18.1/examples/Debian/wview.sh wview-5.18.1-patch/examples/Debian/wview.sh
--- wview-5.18.1/examples/Debian/wview.sh	2009-12-26 16:58:04.000000000 +0200
+++ wview-5.18.1-patch/examples/Debian/wview.sh	2011-03-15 10:34:47.703076254 +0200
@@ -8,7 +8,7 @@
 # Description: Start wview daemons at boot time.
 ### END INIT INFO
 # config: $prefix/etc/wview
-# pidfiles: $prefix/var/wview/*.pid
+# pidfiles: /var/lib/wview/*.pid
 ################################################################################
 
 WVIEWD_FILE=`cat $CONF_DIRECTORY/wview-binary`
diff -urN wview-5.18.1/examples/FedoraCore/Makefile.am wview-5.18.1-patch/examples/FedoraCore/Makefile.am
--- wview-5.18.1/examples/FedoraCore/Makefile.am	2009-11-28 19:32:06.000000000 +0200
+++ wview-5.18.1-patch/examples/FedoraCore/Makefile.am	2011-03-15 10:34:47.704076537 +0200
@@ -11,7 +11,7 @@
 	echo "#!/bin/bash" > wview
 	echo "" >> wview
 	echo "# add to the shared library search path" >> wview
-	echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/local/lib:/usr/lib" >> wview
+	echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/lib:/usr/lib" >> wview
 	echo "CONF_DIRECTORY=$(sysconfdir)/wview" >> wview
 	echo "RUN_DIRECTORY=$(localstatedir)/wview" >> wview
 	echo "WVIEW_INSTALL_DIR=$(exec_prefix)/bin" >> wview
diff -urN wview-5.18.1/examples/FedoraCore/Makefile.in wview-5.18.1-patch/examples/FedoraCore/Makefile.in
--- wview-5.18.1/examples/FedoraCore/Makefile.in	2011-03-14 20:46:01.000000000 +0200
+++ wview-5.18.1-patch/examples/FedoraCore/Makefile.in	2011-03-15 10:34:47.705076611 +0200
@@ -337,7 +337,7 @@
 	echo "#!/bin/bash" > wview
 	echo "" >> wview
 	echo "# add to the shared library search path" >> wview
-	echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/local/lib:/usr/lib" >> wview
+	echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/lib:/usr/lib" >> wview
 	echo "CONF_DIRECTORY=$(sysconfdir)/wview" >> wview
 	echo "RUN_DIRECTORY=$(localstatedir)/wview" >> wview
 	echo "WVIEW_INSTALL_DIR=$(exec_prefix)/bin" >> wview
diff -urN wview-5.18.1/examples/FedoraCore/wview.sh wview-5.18.1-patch/examples/FedoraCore/wview.sh
--- wview-5.18.1/examples/FedoraCore/wview.sh	2010-01-12 17:04:04.000000000 +0200
+++ wview-5.18.1-patch/examples/FedoraCore/wview.sh	2011-03-15 10:34:47.719076393 +0200
@@ -5,7 +5,7 @@
 #
 # processnames: wviewd htmlgend wviewftpd wvalarmd wvcwopd wviewsshd wvhttpd
 # config: $prefix/etc/wview
-# pidfiles: $prefix/var/wview/*.pid
+# pidfiles: /var/lib/wview/*.pid
 
 # Source function library:
 . /etc/init.d/functions
diff -urN wview-5.18.1/examples/FreeBSD/Makefile.am wview-5.18.1-patch/examples/FreeBSD/Makefile.am
--- wview-5.18.1/examples/FreeBSD/Makefile.am	2011-03-14 21:22:31.000000000 +0200
+++ wview-5.18.1-patch/examples/FreeBSD/Makefile.am	2011-03-15 10:36:13.237141902 +0200
@@ -8,7 +8,7 @@
 CLEANFILES = $(noinst_SCRIPTS)
 
 wview: $(srcdir)/wview.sh
-	echo "#!/usr/local/bin/bash" > wview
+	echo "#!/usr/bin/bash" > wview
 	echo "" >> wview
 	echo "# add to the shared library search path" >> wview
 	echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/local/lib:/usr/lib" >> wview
diff -urN wview-5.18.1/examples/FreeBSD/Makefile.in wview-5.18.1-patch/examples/FreeBSD/Makefile.in
--- wview-5.18.1/examples/FreeBSD/Makefile.in	2011-03-14 21:22:45.000000000 +0200
+++ wview-5.18.1-patch/examples/FreeBSD/Makefile.in	2011-03-15 10:36:25.436327626 +0200
@@ -334,7 +334,7 @@
 
 
 wview: $(srcdir)/wview.sh
-	echo "#!/usr/local/bin/bash" > wview
+	echo "#!/usr/bin/bash" > wview
 	echo "" >> wview
 	echo "# add to the shared library search path" >> wview
 	echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/local/lib:/usr/lib" >> wview
diff -urN wview-5.18.1/examples/MacOSX/wview/Makefile.am wview-5.18.1-patch/examples/MacOSX/wview/Makefile.am
--- wview-5.18.1/examples/MacOSX/wview/Makefile.am	2009-11-28 19:32:06.000000000 +0200
+++ wview-5.18.1-patch/examples/MacOSX/wview/Makefile.am	2011-03-15 10:34:47.731076170 +0200
@@ -11,7 +11,7 @@
 	echo "#!/bin/sh" > wview
 	echo "" >> wview
 	echo "# add to the shared library search path" >> wview
-	echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/local/lib:/usr/lib" >> wview
+	echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/lib:/usr/lib" >> wview
 	echo "CONF_DIRECTORY=$(sysconfdir)/wview" >> wview
 	echo "RUN_DIRECTORY=$(localstatedir)/wview" >> wview
 	echo "WVIEW_INSTALL_DIR=$(exec_prefix)/bin" >> wview
diff -urN wview-5.18.1/examples/MacOSX/wview/Makefile.in wview-5.18.1-patch/examples/MacOSX/wview/Makefile.in
--- wview-5.18.1/examples/MacOSX/wview/Makefile.in	2011-03-14 20:46:02.000000000 +0200
+++ wview-5.18.1-patch/examples/MacOSX/wview/Makefile.in	2011-03-15 10:34:47.733076527 +0200
@@ -337,7 +337,7 @@
 	echo "#!/bin/sh" > wview
 	echo "" >> wview
 	echo "# add to the shared library search path" >> wview
-	echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/local/lib:/usr/lib" >> wview
+	echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/lib:/usr/lib" >> wview
 	echo "CONF_DIRECTORY=$(sysconfdir)/wview" >> wview
 	echo "RUN_DIRECTORY=$(localstatedir)/wview" >> wview
 	echo "WVIEW_INSTALL_DIR=$(exec_prefix)/bin" >> wview
diff -urN wview-5.18.1/examples/NSLU2/wview.sh wview-5.18.1-patch/examples/NSLU2/wview.sh
--- wview-5.18.1/examples/NSLU2/wview.sh	2009-03-08 09:23:08.000000000 +0200
+++ wview-5.18.1-patch/examples/NSLU2/wview.sh	2011-03-15 10:34:47.734076532 +0200
@@ -3,7 +3,7 @@
 # Process Names: radmrouted wviewd htmlgend wviewftpd wvalarmd 
 # wvcwopd wviewsshd wvhttpd
 # Config: /etc/wview/*.conf
-# Pidfiles: /var/wview/*.pid
+# Pidfiles: /var/lib/wview/*.pid
 #
 
 RADROUTER_BIN=$WVIEW_INSTALL_DIR/radmrouted
diff -urN wview-5.18.1/examples/scripts/sqlite2mysql-HOWTO.txt wview-5.18.1-patch/examples/scripts/sqlite2mysql-HOWTO.txt
--- wview-5.18.1/examples/scripts/sqlite2mysql-HOWTO.txt	2009-02-05 07:09:33.000000000 +0200
+++ wview-5.18.1-patch/examples/scripts/sqlite2mysql-HOWTO.txt	2011-03-15 10:34:47.735082891 +0200
@@ -1,5 +1,5 @@
 copy the sqlite archive file to a working directory of your choice:
-cp /usr/local/var/wview/archive/wview-archive.sdb .
+cp /var/lib/wview/archive/wview-archive.sdb .
 
 Dump the sqlite file, in this case:
 sqlite3 wview-archive.sdb .dump .quit >> wview-archive-dump.sql
diff -urN wview-5.18.1/examples/scripts/wview-ftp.sh wview-5.18.1-patch/examples/scripts/wview-ftp.sh
--- wview-5.18.1/examples/scripts/wview-ftp.sh	2009-03-28 16:38:45.000000000 +0200
+++ wview-5.18.1-patch/examples/scripts/wview-ftp.sh	2011-03-15 10:34:47.736076611 +0200
@@ -21,9 +21,9 @@
 # These are probably fine, but can be changed if desired, or if images
 are stored elsewhere
 
-IMG_DIR=/var/wview/img
+IMG_DIR=/var/lib/wview/img
 FTP_LAST_SENT_FILE=ftp-last-sent
-FTP_ERROR_LOG=/var/wview/ftperrors
+FTP_ERROR_LOG=/var/lib/wview/ftperrors
 
 # Set VERBOSE to 1 to log all ftp transers to /var/log/messages. 0
 turns logging off.
diff -urN wview-5.18.1/examples/SuSE/Makefile.am wview-5.18.1-patch/examples/SuSE/Makefile.am
--- wview-5.18.1/examples/SuSE/Makefile.am	2009-11-28 19:32:06.000000000 +0200
+++ wview-5.18.1-patch/examples/SuSE/Makefile.am	2011-03-15 10:34:47.737076616 +0200
@@ -11,7 +11,7 @@
 	echo "#!/bin/sh" > wview
 	echo "" >> wview
 	echo "# add to the shared library search path" >> wview
-	echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/local/lib:/usr/lib" >> wview
+	echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/lib:/usr/lib" >> wview
 	echo "CONF_DIRECTORY=$(sysconfdir)/wview" >> wview
 	echo "RUN_DIRECTORY=$(localstatedir)/wview" >> wview
 	echo "WVIEW_INSTALL_DIR=$(exec_prefix)/bin" >> wview
diff -urN wview-5.18.1/examples/SuSE/Makefile.in wview-5.18.1-patch/examples/SuSE/Makefile.in
--- wview-5.18.1/examples/SuSE/Makefile.in	2011-03-14 20:46:02.000000000 +0200
+++ wview-5.18.1-patch/examples/SuSE/Makefile.in	2011-03-15 10:34:47.739076136 +0200
@@ -337,7 +337,7 @@
 	echo "#!/bin/sh" > wview
 	echo "" >> wview
 	echo "# add to the shared library search path" >> wview
-	echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/local/lib:/usr/lib" >> wview
+	echo "export LD_LIBRARY_PATH=$(prefix)/lib:/usr/lib:/usr/lib" >> wview
 	echo "CONF_DIRECTORY=$(sysconfdir)/wview" >> wview
 	echo "RUN_DIRECTORY=$(localstatedir)/wview" >> wview
 	echo "WVIEW_INSTALL_DIR=$(exec_prefix)/bin" >> wview
diff -urN wview-5.18.1/ftp/wviewftp.debug.sh wview-5.18.1-patch/ftp/wviewftp.debug.sh
--- wview-5.18.1/ftp/wviewftp.debug.sh	2009-02-05 07:09:28.000000000 +0200
+++ wview-5.18.1-patch/ftp/wviewftp.debug.sh	2011-03-15 10:34:47.741076075 +0200
@@ -20,7 +20,7 @@
 # 3. modify the LOGFILE and wviewVAR variables below:
 #
 LOGFILE=/root/wview/wview_ftp_debug.txt
-wviewVAR=/usr/local/var/wview
+wviewVAR=/var/lib/wview
 wviewFTP_BINARY=/usr/bin/tnftp
 #
 # 4. modify your wviewftp.conf file and have wview execute this script for 
diff -urN wview-5.18.1/http/Makefile.am wview-5.18.1-patch/http/Makefile.am
--- wview-5.18.1/http/Makefile.am	2011-03-06 23:21:00.000000000 +0200
+++ wview-5.18.1-patch/http/Makefile.am	2011-03-15 10:34:47.742076079 +0200
@@ -10,7 +10,7 @@
 		-I$(top_srcdir)/common \
 		-I$(prefix)/include \
 		-I/usr/include \
-		-I/usr/local/include \
+		-I/usr/include \
 		-D_GNU_SOURCE \
 		-DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \
 		-DWV_RUN_DIR=\"$(localstatedir)/wview\" \
diff -urN wview-5.18.1/http/Makefile.in wview-5.18.1-patch/http/Makefile.in
--- wview-5.18.1/http/Makefile.in	2011-03-14 20:46:02.000000000 +0200
+++ wview-5.18.1-patch/http/Makefile.in	2011-03-15 10:34:47.744076158 +0200
@@ -177,7 +177,7 @@
 		-I$(top_srcdir)/common \
 		-I$(prefix)/include \
 		-I/usr/include \
-		-I/usr/local/include \
+		-I/usr/include \
 		-D_GNU_SOURCE \
 		-DWV_CONFIG_DIR=\"$(sysconfdir)/wview\" \
 		-DWV_RUN_DIR=\"$(localstatedir)/wview\" \
diff -urN wview-5.18.1/INSTALL wview-5.18.1-patch/INSTALL
--- wview-5.18.1/INSTALL	2009-02-05 07:09:33.000000000 +0200
+++ wview-5.18.1-patch/INSTALL	2011-03-15 10:34:47.745082588 +0200
@@ -103,8 +103,8 @@
 ==================
 
 By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc. You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
+`/usr/bin', `/usr/man', etc. You can specify an
+installation prefix other than `/usr' by giving `configure' the
 option `--prefix=PREFIX'.
 
 You can specify separate installation prefixes for
@@ -187,7 +187,7 @@
 variables may be lost. In order to avoid this problem, you should set
 them in the `configure' command line, using `VAR=value'. For example:
 
- ./configure CC=/usr/local2/bin/gcc
+ ./configure CC=/usr2/bin/gcc
 
 will cause the specified gcc to be used as the C compiler (unless it is
 overridden in the site shell script).
diff -urN wview-5.18.1/Makefile.am wview-5.18.1-patch/Makefile.am
--- wview-5.18.1/Makefile.am	2011-03-04 15:42:03.000000000 +0200
+++ wview-5.18.1-patch/Makefile.am	2011-03-15 10:34:47.748076106 +0200
@@ -46,16 +46,16 @@
 if INSTALL_DPKG
 	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)
 	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var
-	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/wview
-	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/wview/noaa
-	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/wview/alarms
-	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/wview/img
-	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/wview/img/Archive
-	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/wview/img/NOAA
-	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/wview/archive
-	cp -fp $(top_srcdir)/bin/img/*.* $(DESTDIR)$(WV_SHARE_DIR)/var/wview/img
-	cp -fp $(top_srcdir)/examples/html/chrome/static/*.* $(DESTDIR)$(WV_SHARE_DIR)/var/wview/img
-	cp -fp $(top_srcdir)/bin/archive/* $(DESTDIR)$(WV_SHARE_DIR)/var/wview/archive
+	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview
+	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/noaa
+	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/alarms
+	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/img
+	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/img/Archive
+	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/img/NOAA
+	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/archive
+	cp -fp $(top_srcdir)/bin/img/*.* $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/img
+	cp -fp $(top_srcdir)/examples/html/chrome/static/*.* $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/img
+	cp -fp $(top_srcdir)/bin/archive/* $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/archive
 	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/etc
 	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/etc/wview
 	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/etc/wview/export
diff -urN wview-5.18.1/Makefile.in wview-5.18.1-patch/Makefile.in
--- wview-5.18.1/Makefile.in	2011-03-14 20:46:04.000000000 +0200
+++ wview-5.18.1-patch/Makefile.in	2011-03-15 10:34:47.750075975 +0200
@@ -733,16 +733,16 @@
 install-data-hook:
 @INSTALL_DPKG_TRUE@	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)
 @INSTALL_DPKG_TRUE@	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var
-@INSTALL_DPKG_TRUE@	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/wview
-@INSTALL_DPKG_TRUE@	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/wview/noaa
-@INSTALL_DPKG_TRUE@	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/wview/alarms
-@INSTALL_DPKG_TRUE@	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/wview/img
-@INSTALL_DPKG_TRUE@	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/wview/img/Archive
-@INSTALL_DPKG_TRUE@	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/wview/img/NOAA
-@INSTALL_DPKG_TRUE@	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/wview/archive
-@INSTALL_DPKG_TRUE@	cp -fp $(top_srcdir)/bin/img/*.* $(DESTDIR)$(WV_SHARE_DIR)/var/wview/img
-@INSTALL_DPKG_TRUE@	cp -fp $(top_srcdir)/examples/html/chrome/static/*.* $(DESTDIR)$(WV_SHARE_DIR)/var/wview/img
-@INSTALL_DPKG_TRUE@	cp -fp $(top_srcdir)/bin/archive/* $(DESTDIR)$(WV_SHARE_DIR)/var/wview/archive
+@INSTALL_DPKG_TRUE@	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview
+@INSTALL_DPKG_TRUE@	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/noaa
+@INSTALL_DPKG_TRUE@	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/alarms
+@INSTALL_DPKG_TRUE@	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/img
+@INSTALL_DPKG_TRUE@	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/img/Archive
+@INSTALL_DPKG_TRUE@	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/img/NOAA
+@INSTALL_DPKG_TRUE@	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/archive
+@INSTALL_DPKG_TRUE@	cp -fp $(top_srcdir)/bin/img/*.* $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/img
+@INSTALL_DPKG_TRUE@	cp -fp $(top_srcdir)/examples/html/chrome/static/*.* $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/img
+@INSTALL_DPKG_TRUE@	cp -fp $(top_srcdir)/bin/archive/* $(DESTDIR)$(WV_SHARE_DIR)/var/lib/wview/archive
 @INSTALL_DPKG_TRUE@	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/etc
 @INSTALL_DPKG_TRUE@	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/etc/wview
 @INSTALL_DPKG_TRUE@	mkdir -p $(DESTDIR)$(WV_SHARE_DIR)/etc/wview/export
diff -urN wview-5.18.1/scripts/wview-install-debian wview-5.18.1-patch/scripts/wview-install-debian
--- wview-5.18.1/scripts/wview-install-debian	2010-06-13 17:54:15.000000000 +0300
+++ wview-5.18.1-patch/scripts/wview-install-debian	2011-03-15 10:37:00.287328062 +0200
@@ -17,7 +17,7 @@
 ###############################################################################
 
 ## These are the only two macros you should need to change:
-INSTALL_PREFIX=/usr/local
+INSTALL_PREFIX=/usr
 RADLIB_VERSION=2.10.1
 
 
@@ -51,7 +51,7 @@
 echo "OR - specify -f to this script to force a clean install (delete all existing data)"
 exit 1
 fi
- if [ -x $INSTALL_PREFIX/var/wview ]; then
+ if [ -x $INSTALL_PREFIX/var/lib/wview ]; then
 echo "wview is installed - use wview-update to update existing installs >= 5.4.0"
 echo "OR - specify -f to this script to force a clean install (delete all existing data)"
 exit 1
@@ -100,7 +100,7 @@
 # clean up as much as possible before the clean install
 rm -rf /etc/init.d/wview
 rm -f $INSTALL_PREFIX/lib/librad.*
-rm -rf $INSTALL_PREFIX/var/wview
+rm -rf $INSTALL_PREFIX/var/lib/wview
 rm -rf $INSTALL_PREFIX/include/rad*
 rm -rf $INSTALL_PREFIX/etc/wview
 rm -rf $INSTALL_PREFIX/etc/wviewmgmt
@@ -175,10 +175,10 @@
 echo "No http links created for weather data and configuration"
 else
 if [ ! -x $HTTP_ROOT/weather ]; then
- ln -s $INSTALL_PREFIX/var/wview/img $HTTP_ROOT/weather
+ ln -s $INSTALL_PREFIX/var/lib/wview/img $HTTP_ROOT/weather
 fi
 if [ ! -x $HTTP_ROOT/wviewmgmt ]; then
- ln -s $INSTALL_PREFIX/var/wviewmgmt $HTTP_ROOT/wviewmgmt
+ ln -s $INSTALL_PREFIX/var/lib/wviewmgmt $HTTP_ROOT/wviewmgmt
 fi
 fi
 
diff -urN wview-5.18.1/scripts/wview-install-macosx wview-5.18.1-patch/scripts/wview-install-macosx
--- wview-5.18.1/scripts/wview-install-macosx	2009-11-28 19:32:04.000000000 +0200
+++ wview-5.18.1-patch/scripts/wview-install-macosx	2011-03-15 10:34:47.754075994 +0200
@@ -13,7 +13,7 @@
 #
 # Uses the $prefix of "/opt/local" thus wview config will
 # be found at /opt/local/etc/wview and wview data will be
-# found at /opt/local/var/wview.
+# found at /opt/local/var/lib/wview.
 ###############################################################################
 
 # First, update the ports info:
diff -urN wview-5.18.1/scripts/wview-update wview-5.18.1-patch/scripts/wview-update
--- wview-5.18.1/scripts/wview-update	2010-06-13 17:54:15.000000000 +0300
+++ wview-5.18.1-patch/scripts/wview-update	2011-03-15 10:38:40.678077479 +0200
@@ -8,13 +8,13 @@
 # Notes: Must be run with root privileges (sudo ./wview-update).
 #
 # Assumes that $prefix for radlib and wview configure was the
-# default of "/usr/local" for previous installs. To change this
+# default of "/usr" for previous installs. To change this
 # edit the INSTALL_PREFIX definition.
 #
 # Will only update an existing installation.
 #
 ###############################################################################
-INSTALL_PREFIX=/usr/local
+INSTALL_PREFIX=/usr
 RADLIB_VERSION=2.10.1
 
 BUILD_LOC=$INSTALL_PREFIX/src
diff -urN wview-5.18.1/scripts/wview-update-macosx wview-5.18.1-patch/scripts/wview-update-macosx
--- wview-5.18.1/scripts/wview-update-macosx	2009-11-28 19:32:04.000000000 +0200
+++ wview-5.18.1-patch/scripts/wview-update-macosx	2011-03-15 10:34:47.757083620 +0200
@@ -13,7 +13,7 @@
 #
 # Uses the $prefix of "/opt/local" thus wview config will
 # be found at /opt/local/etc/wview and wview data will be
-# found at /opt/local/var/wview.
+# found at /opt/local/var/lib/wview.
 ###############################################################################
 
 echo "Stopping wview:"
diff -urN wview-5.18.1/ssh/sshUtils.c wview-5.18.1-patch/ssh/sshUtils.c
--- wview-5.18.1/ssh/sshUtils.c	2010-11-17 16:17:13.000000000 +0200
+++ wview-5.18.1-patch/ssh/sshUtils.c	2011-03-15 10:34:47.761076094 +0200
@@ -48,9 +48,9 @@
 static char *rsyncPaths[] =
 {
 "/usr/bin/rsync",
- "/usr/local/bin/rsync",
+ "/usr/bin/rsync",
+ "/usr/sbin/rsync",
 "/usr/sbin/rsync",
- "/usr/local/sbin/rsync",
 NULL
 };
 
diff -urN wview-5.18.1/stations/VantagePro/vpconfig/vpinstall.sh wview-5.18.1-patch/stations/VantagePro/vpconfig/vpinstall.sh
--- wview-5.18.1/stations/VantagePro/vpconfig/vpinstall.sh	2011-03-11 01:21:02.000000000 +0200
+++ wview-5.18.1-patch/stations/VantagePro/vpconfig/vpinstall.sh	2011-03-15 10:34:47.763076313 +0200
@@ -19,7 +19,7 @@
 SCRIPTNAME=vpinstall
 SCRIPTNAME_VERSION="1.0.1"
 
-WVIEWD_PID=/var/wview/wviewd.pid
+WVIEWD_PID=/var/lib/wview/wviewd.pid
 VPCONFIG_BIN=$WVIEW_INSTALL_DIR/vpconfig
 test -x $VPCONFIG_BIN || (echo "vpconfig not installed!"; exit 2)
 
@@ -243,7 +243,7 @@
 echo "first time so the Vantage Pro can become consistent with the new settings..."
 echo ""
 echo "In the meantime, be sure you have deleted any archive files in"
-echo "/var/wview/archive if you have changed the archive interval..."
+echo "/var/lib/wview/archive if you have changed the archive interval..."
 echo ""
 echo "Vantage Pro configuration complete!"
 echo ""
diff -urN wview-5.18.1/stations/VantagePro/vproStates.c wview-5.18.1-patch/stations/VantagePro/vproStates.c
--- wview-5.18.1/stations/VantagePro/vproStates.c	2011-03-11 01:21:02.000000000 +0200
+++ wview-5.18.1-patch/stations/VantagePro/vproStates.c	2011-03-15 10:34:47.784076199 +0200
@@ -110,7 +110,7 @@
 if (stationVerifyArchiveInterval (work) == ERROR)
 {
 radMsgLog (PRI_HIGH, "vproStartProcState: stationVerifyArchiveInterval failed!");
- radMsgLog (PRI_HIGH, "You must either move old /var/wview/archive files out of the way -or-");
+ radMsgLog (PRI_HIGH, "You must either move old /var/lib/wview/archive files out of the way -or-");
 radMsgLog (PRI_HIGH, "fix the station setting...");
 radProcessEventsSend (NULL, STATION_INIT_COMPLETE_EVENT, 1);
 emailAlertSend(ALERT_TYPE_STATION_READ);
diff -urN wview-5.18.1/stations/WS-2300/ws2300protocol.c wview-5.18.1-patch/stations/WS-2300/ws2300protocol.c
--- wview-5.18.1/stations/WS-2300/ws2300protocol.c	2011-03-11 01:21:03.000000000 +0200
+++ wview-5.18.1-patch/stations/WS-2300/ws2300protocol.c	2011-03-15 10:34:47.796077930 +0200
@@ -449,7 +449,7 @@
 {
 // bad magic!
 radMsgLog (PRI_HIGH, "stationInit: stationVerifyArchiveInterval failed!");
- radMsgLog (PRI_HIGH, "You must either move old /var/wview/archive files out of the way -or-");
+ radMsgLog (PRI_HIGH, "You must either move old /var/lib/wview/archive files out of the way -or-");
 radMsgLog (PRI_HIGH, "fix the wview.conf setting...");
 (*(work->medium.exit)) (&work->medium);
 return WS_STATE_ERROR;
diff -urN wview-5.18.1/UPGRADE wview-5.18.1-patch/UPGRADE
--- wview-5.18.1/UPGRADE	2009-12-22 17:54:53.000000000 +0200
+++ wview-5.18.1-patch/UPGRADE	2011-03-15 10:34:47.799078640 +0200
@@ -37,19 +37,19 @@
 Version Specific Directions
 ---------------------------
 
-0.8.1 or Older: (backup your /usr/local/wview directory first):
+0.8.1 or Older: (backup your /usr/share/wview directory first):
 ---------------
 
 (Mandatory)
 
- a) mv /usr/local/wview/html /etc/wview/html
- b) mv /usr/local/wview/*.conf /etc/wview
- c) mv /usr/local/wview/archive /var/wview/archive
- d) mv /usr/local/wview/img /var/wview/img
- e) mv /usr/local/wview/noaa.dat /var/wview/noaa/noaa.dat
+ a) mv /usr/share/wview/html /etc/wview/html
+ b) mv /usr/share/wview/*.conf /etc/wview
+ c) mv /usr/share/wview/archive /var/lib/wview/archive
+ d) mv /usr/share/wview/img /var/lib/wview/img
+ e) mv /usr/share/wview/noaa.dat /var/lib/wview/noaa/noaa.dat
 f) Edit your start script (/etc/init.d/wview or /etc/rc.d/wview)
- and change the path to the binaries from /usr/local/wview to
- /usr/local/bin, change run path from /usr/local/wview to /var/wview 
+ and change the path to the binaries from /usr/share/wview to
+ /usr/bin, change run path from /usr/share/wview to /var/lib/wview 
 then change the executable name for ftpd to wviewftpd (see the
 new wview start scripts in examples/* for examples of these
 changes).
@@ -186,23 +186,23 @@
 execution from a chroot jail and/or allow package management
 systems to specify an install/run root prefix, the configure
 script "--prefix" argument now controls not only where binaries
- are installed but also where "/etc/wview" and "/var/wview" are
+ are installed but also where "/etc/wview" and "/var/lib/wview" are
 located. The default for configure if no "--prefix" argument
- is given is "--prefix=/usr/local". So the new default locations
- are: "/usr/local/etc/wview" and "/usr/local/var/wview". 
+ is given is "--prefix=/usr". So the new default locations
+ are: "/etc/wview" and "/var/lib/wview". 
 Executing "sudo make install-env" for 3.7.0 will create these
 directories for you, then you will need to move anything 
- pertinent from the old "/etc/wview" and "/var/wview" locations
+ pertinent from the old "/etc/wview" and "/var/lib/wview" locations
 to the new "prefix" locations. Obvious choices are:
- "/var/wview/archive"
- "/var/wview/alarms" - if applicable
+ "/var/lib/wview/archive"
+ "/var/lib/wview/alarms" - if applicable
 "/etc/wview/alarms" - if applicable
 "/etc/wview/*.conf <contents>" - not advisable to move directly
 "/etc/wview/html customizations"
 
 Alternatively, if you just refuse to be compliant ;) and *must*
 keep your config and data trees on the root prefix, you can
- specify "--prefix=/ --exec-prefix=/usr/local". But this means
+ specify "--prefix=/ --exec-prefix=/usr". But this means
 you must remember this every time you upgrade wview and I am 
 not going to keep reminding you...
 
@@ -261,12 +261,12 @@
 wview distribution to import existing WLK archive data to the
 new SQLite3 database. A default empty archive database file
 will be installed when you use "make install-env" and is 
- located in a familiar place: $prefix/var/wview/archive. The
+ located in a familiar place: /var/lib/wview/archive. The
 database filename is "wview-archive.sdb". Entering "sudo wlk2sqlite"
 with no parameters at a shell prompt will display usage details.
- wlk2sqlite may require adding "/usr/local/lib" to the 
+ wlk2sqlite may require adding "/usr/lib" to the 
 "LD_LIBRARY_PATH" environment variable:
- >export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
+ >export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib
 The User Manual has more details on this process.
 
 5.1.1 or Older:
@@ -286,12 +286,12 @@
 1) Leave your old version running, so long as it is 5.0.0+
 (i.e., creating archives in wview-archive.sdb).
 2) Build and install wview 5.1.1+.
- 3) Copy your $prefix/var/wview/archive/wview-archive.sdb database
+ 3) Copy your /var/lib/wview/archive/wview-archive.sdb database
 to a working directory.
 4) Execute the utility:
 > hilowcreate [working_directory]
 5) When it completes, copy the resulting wview-hilow.sdb database
- to $prefix/var/wview/archive.
+ to /var/lib/wview/archive.
 6) Stop old wview.
 7) Start new wview, it will pick up archive records for HILOW
 that were generated during the execution of hilowcreate.
diff -urN wview-5.18.1/utilities/wlk2sqlite/wlk2sqlite.c wview-5.18.1-patch/utilities/wlk2sqlite/wlk2sqlite.c
--- wview-5.18.1/utilities/wlk2sqlite/wlk2sqlite.c	2009-03-19 14:07:22.000000000 +0200
+++ wview-5.18.1-patch/utilities/wlk2sqlite/wlk2sqlite.c	2011-03-15 10:34:47.801076903 +0200
@@ -31,7 +31,7 @@
 {
 printf ("Usage: wlk2sqlite <source_directory> [destination_directory]\n\n");
 printf (" Convert WLK archive file data in <source_directory> to SQLite3 format in [destination_directory]/wview-archive.sdb\n");
- printf (" or to $prefix/var/wview/archive/wview-archive.sdb if [destination_directory] is not given\n");
+ printf (" or to /var/lib/wview/archive/wview-archive.sdb if [destination_directory] is not given\n");
 printf ("Note: Must be run as root if [destination_directory] is not given. Only unique records will be inserted.\n");
 printf ("Note: <source_directory> can be the same as [destination_directory]\n\n");
 return;
@@ -292,7 +292,7 @@
 }
 if (argc < 3)
 {
- printf("Using default $prefix/var/wview/archive destination...\n");
+ printf("Using default /var/lib/archive destination...\n");
 DestDir = NULL;
 }
 else
diff -urN wview-5.18.1/wviewconfig/wviewhtmlconfig.sh wview-5.18.1-patch/wviewconfig/wviewhtmlconfig.sh
--- wview-5.18.1/wviewconfig/wviewhtmlconfig.sh	2009-12-05 16:35:54.000000000 +0200
+++ wview-5.18.1-patch/wviewconfig/wviewhtmlconfig.sh	2011-03-15 10:34:47.802075859 +0200
@@ -190,7 +190,7 @@
 ################################################################################
 ################## S C R I P T E X E C U T I O N S T A R T #################
 ################################################################################
-export PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin
+export PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/bin:/usr/sbin
 
 get_wviewconfig
 
diff -urN wview-5.18.1/wviewmgmt/ftp.php wview-5.18.1-patch/wviewmgmt/ftp.php
--- wview-5.18.1/wviewmgmt/ftp.php	2011-03-11 01:44:10.000000000 +0200
+++ wview-5.18.1-patch/wviewmgmt/ftp.php	2011-03-15 10:34:47.805076083 +0200
@@ -327,7 +327,7 @@
 <td valaign="center" bgcolor="#FFFFFF"> 
 <label class="formFieldQuestion">Source File(s) (can have wildcards):&nbsp;
 <a class=info href=#><img src=imgs/tip_small.png border=0>
- Source file (relative to $prefix/var/wview/img)
+ Source file (relative to /var/lib/wview/img)
 </a>
 </label>
 </td>
@@ -366,7 +366,7 @@
 <td valaign="center" bgcolor="#FFFFFF"> 
 <label class="formFieldQuestion">Source File(s) (can have wildcards):&nbsp;
 <a class=info href=#><img src=imgs/tip_small.png border=0>
- Source file (relative to $prefix/var/wview/img)
+ Source file (relative to /var/lib/wview/img)
 </a>
 </label>
 </td>
@@ -405,7 +405,7 @@
 <td valaign="center" bgcolor="#FFFFFF"> 
 <label class="formFieldQuestion">Source File(s) (can have wildcards):&nbsp;
 <a class=info href=#><img src=imgs/tip_small.png border=0>
- Source file (relative to $prefix/var/wview/img)
+ Source file (relative to /var/lib/wview/img)
 </a>
 </label>
 </td>
@@ -444,7 +444,7 @@
 <td valaign="center" bgcolor="#FFFFFF"> 
 <label class="formFieldQuestion">Source File(s) (can have wildcards):&nbsp;
 <a class=info href=#><img src=imgs/tip_small.png border=0>
- Source file (relative to $prefix/var/wview/img)
+ Source file (relative to /var/lib/wview/img)
 </a>
 </label>
 </td>
@@ -483,7 +483,7 @@
 <td valaign="center" bgcolor="#FFFFFF"> 
 <label class="formFieldQuestion">Source File(s) (can have wildcards):&nbsp;
 <a class=info href=#><img src=imgs/tip_small.png border=0>
- Source file (relative to $prefix/var/wview/img)
+ Source file (relative to /var/lib/wview/img)
 </a>
 </label>
 </td>
@@ -522,7 +522,7 @@
 <td valaign="center" bgcolor="#FFFFFF"> 
 <label class="formFieldQuestion">Source File(s) (can have wildcards):&nbsp;
 <a class=info href=#><img src=imgs/tip_small.png border=0>
- Source file (relative to $prefix/var/wview/img)
+ Source file (relative to /var/lib/wview/img)
 </a>
 </label>
 </td>
@@ -561,7 +561,7 @@
 <td valaign="center" bgcolor="#FFFFFF"> 
 <label class="formFieldQuestion">Source File(s) (can have wildcards):&nbsp;
 <a class=info href=#><img src=imgs/tip_small.png border=0>
- Source file (relative to $prefix/var/wview/img)
+ Source file (relative to /var/lib/wview/img)
 </a>
 </label>
 </td>
@@ -600,7 +600,7 @@
 <td valaign="center" bgcolor="#FFFFFF"> 
 <label class="formFieldQuestion">Source File(s) (can have wildcards):&nbsp;
 <a class=info href=#><img src=imgs/tip_small.png border=0>
- Source file (relative to $prefix/var/wview/img)
+ Source file (relative to /var/lib/wview/img)
 </a>
 </label>
 </td>
@@ -639,7 +639,7 @@
 <td valaign="center" bgcolor="#FFFFFF"> 
 <label class="formFieldQuestion">Source File(s) (can have wildcards):&nbsp;
 <a class=info href=#><img src=imgs/tip_small.png border=0>
- Source file (relative to $prefix/var/wview/img)
+ Source file (relative to /var/lib/wview/img)
 </a>
 </label>
 </td>
@@ -678,7 +678,7 @@
 <td valaign="center" bgcolor="#FFFFFF"> 
 <label class="formFieldQuestion">Source File(s) (can have wildcards):&nbsp;
 <a class=info href=#><img src=imgs/tip_small.png border=0>
- Source file (relative to $prefix/var/wview/img)
+ Source file (relative to /var/lib/wview/img)
 </a>
 </label>
 </td>
diff -urN wview-5.18.1/wviewmgmt/preload_system_status.php wview-5.18.1-patch/wviewmgmt/preload_system_status.php
--- wview-5.18.1/wviewmgmt/preload_system_status.php	2011-03-11 01:44:10.000000000 +0200
+++ wview-5.18.1-patch/wviewmgmt/preload_system_status.php	2011-03-15 10:34:47.807076093 +0200
@@ -65,7 +65,7 @@
 $field_latest_version = file_get_contents('http://www.wviewweather.com/wview-latest.txt');
 
 // See if the wviewPlug updater is installed:
- $pidstr = "/usr/local/bin/wviewPlug-updater";
+ $pidstr = "/usr/bin/wviewPlug-updater";
 if (file_exists($pidstr))
 {
 $field_updater_exists = true;
diff -urN wview-5.18.1/wviewmgmt/ssh.php wview-5.18.1-patch/wviewmgmt/ssh.php
--- wview-5.18.1/wviewmgmt/ssh.php	2011-03-11 01:44:10.000000000 +0200
+++ wview-5.18.1-patch/wviewmgmt/ssh.php	2011-03-15 10:34:47.810076036 +0200
@@ -186,7 +186,7 @@
 <td valign="center" bgcolor="#FFFFFF"> 
 <label class="formFieldQuestion">Source File or Directory:&nbsp;
 <a class=info href=#><img src=imgs/tip_small.png border=0>
- Local Source directory (normally $prefix/var/wview/img)
+ Local Source directory (normally /var/lib/wview/img)
 </a>
 </label>
 </td>
@@ -324,7 +324,7 @@
 <td valign="center" bgcolor="#FFFFFF"> 
 <label class="formFieldQuestion">Source File or Directory:&nbsp;
 <a class=info href=#><img src=imgs/tip_small.png border=0>
- Local Source directory (normally $prefix/var/wview/img)
+ Local Source directory (normally /var/lib/wview/img)
 </a>
 </label>
 </td>
@@ -462,7 +462,7 @@
 <td valign="center" bgcolor="#FFFFFF"> 
 <label class="formFieldQuestion">Source File or Directory:&nbsp;
 <a class=info href=#><img src=imgs/tip_small.png border=0>
- Local Source directory (normally $prefix/var/wview/img)
+ Local Source directory (normally /var/lib/wview/img)
 </a>
 </label>
 </td>
@@ -600,7 +600,7 @@
 <td valign="center" bgcolor="#FFFFFF"> 
 <label class="formFieldQuestion">Source File or Directory:&nbsp;
 <a class=info href=#><img src=imgs/tip_small.png border=0>
- Local Source directory (normally $prefix/var/wview/img)
+ Local Source directory (normally /var/lib/wview/img)
 </a>
 </label>
 </td>
@@ -738,7 +738,7 @@
 <td valign="center" bgcolor="#FFFFFF"> 
 <label class="formFieldQuestion">Source File or Directory:&nbsp;
 <a class=info href=#><img src=imgs/tip_small.png border=0>
- Local Source directory (normally $prefix/var/wview/img)
+ Local Source directory (normally /var/lib/wview/img)
 </a>
 </label>
 </td>
diff -urN wview-5.18.1/wview-Quick-Start.html wview-5.18.1-patch/wview-Quick-Start.html
--- wview-5.18.1/wview-Quick-Start.html	2011-03-14 20:50:49.000000000 +0200
+++ wview-5.18.1-patch/wview-Quick-Start.html	2011-03-15 10:34:47.812076115 +0200
@@ -123,7 +123,7 @@
 <li>Build wview: make</li>
 <li>Install wview: sudo make install</li>
 <li>If new Vantage Pro, use the on-screen console configuration wizard</li>
- <li>If new Vantage Pro, configure the console: /usr/local/bin/vpinstall</li>
+ <li>If new Vantage Pro, configure the console: /usr/bin/vpinstall</li>
 <li>Configure wview: $prefix/bin/wviewconfig</li>
 <li>Configure wview HTML Templates: $prefix/bin/wviewhtmlconfig</li>
 <li>If new install, copy the run script: cp ./examples/[your_distro]/wview /etc/[your_distro_rc.d_dir]</li>
diff -urN wview-5.18.1/wview-Quick-Start-MacOSX.html wview-5.18.1-patch/wview-Quick-Start-MacOSX.html
--- wview-5.18.1/wview-Quick-Start-MacOSX.html	2009-10-21 16:18:21.000000000 +0300
+++ wview-5.18.1-patch/wview-Quick-Start-MacOSX.html	2011-03-15 10:34:47.813075771 +0200
@@ -36,7 +36,7 @@
 your ~/.profile file: "export PATH=$PATH:/opt/local/bin" - then execute the following: 
 sudo port -d selfupdate (this may take a while) 
 Note: All wview binaries and scripts will be found at /opt/local/bin instead of 
- /usr/local/bin, so all instructions in the User Manual should have "/usr/local" 
+ /usr/bin, so all instructions in the User Manual should have "/usr" 
 replaced with "/opt/local" for Mac installs 
 </li>
 </ul>
@@ -157,10 +157,10 @@
 You should see the log message "doing initial html generation now..." 
 at the end of the wview initialization log messages.
 
- > ls -al /opt/local/var/wview/img/index.html
+ > ls -al /opt/local/var/lib/wview/img/index.html
 (you should see the file listed)
 
- Open /opt/local/var/wview/img/index.html with your favorite browser - this is your 
+ Open /opt/local/var/lib/wview/img/index.html with your favorite browser - this is your 
 new wview homepage.
 </pre>
 
diff -urN wview-5.18.1/wview-User-Manual.html wview-5.18.1-patch/wview-User-Manual.html
--- wview-5.18.1/wview-User-Manual.html	2011-03-14 20:37:32.000000000 +0200
+++ wview-5.18.1-patch/wview-User-Manual.html	2011-03-15 10:34:47.824076448 +0200
@@ -545,17 +545,17 @@
 
 Run Environment: 
 There are several configuration variables which affect the location of the
- wview run environment. "--prefix=xxx" (defaults to /usr/local for source 
+ wview run environment. "--prefix=xxx" (defaults to /usr for source 
 builds) is the top-level root for wview install. If "--sysconfdir=xxx" is 
 given to the configure script, it will override the $prefix value for 
 location of the configuration files. If "--localstatedir=xxx" is given, it
 will override the $prefix value for location of the data files for wview. 
- Most source installs will want to use the default prefix "/usr/local" (by
+ Most source installs will want to use the default prefix "/usr" (by
 not specifying any location parameters to configure). 
 
 There are two file system installation locations of importance for wview.
 The configuration "tree" is found at: $prefix/etc/wview and the data "tree"
- is located at: $prefix/var/wview. The configuration tree includes the
+ is located at: /var/lib/wview. The configuration tree includes the
 SQLite3 configuration database, file generation configuration including 
 templates and several file to support SQL export activities. The data tree
 contains the generated web site (img), all archived weather data (archive)
@@ -708,7 +708,7 @@
  
 Converting a Source Install (tarball) to an APT Install 
 The debian packages install to different locations than the old default 
- /usr/local prefix. Avoid running "make uninstall" with the old distro 
+ /usr prefix. Avoid running "make uninstall" with the old distro 
 until you have secured your data. Make backups of your config and data 
 trees to somewhere safe - like your home directory. 
 For example: 
@@ -721,24 +721,24 @@
 #> sudo mkdir -p ~/wview-save/etc 
 #> sudo mkdir -p ~/wview-save/var 
 #> sudo /etc/init.d/wview stop 
- #> sudo rm -rf /usr/local/var/wview/archive/wview-history.sdb 
+ #> sudo rm -rf /var/lib/wview/archive/wview-history.sdb 
 
 #> sudo rm -rf /etc/init.d/wview 
- #> sudo cp -rf /usr/local/etc/wview ~/wview-save/etc 
- #> sudo cp -rf /usr/local/var/wview ~/wview-save/var 
+ #> sudo cp -rf /etc/wview ~/wview-save/etc 
+ #> sudo cp -rf /var/lib/wview ~/wview-save/var 
 #> sudo rm -f /var/www/weather (this should be a symbolic link) 
 #> sudo rm -rf /var/www/wviewmgmt (this should be a symbolic link) 
- #> cd [radlib_old_source_location] (the old distro source directory, typically /usr/local/src/radlib-X.Y.Z) 
+ #> cd [radlib_old_source_location] (the old distro source directory, typically /usr/src/radlib-X.Y.Z) 
 
 #> sudo make uninstall 
- #> cd [wview_old_source_location] (the old distro source directory, typically /usr/local/src/wview-X.Y.Z) 
+ #> cd [wview_old_source_location] (the old distro source directory, typically /usr/src/wview-X.Y.Z) 
 #> sudo make uninstall 
 #> sudo apt-get install wview 
 (if it asks about replacing /etc/init.d/wview, say "Y") 
 (at this point the simulator will be configured and running) 
 
 #> sudo /etc/init.d/wview stop 
- #> sudo cp -f ~/wview-save/var/wview/archive/*.* /var/lib/wview/archive 
+ #> sudo cp -f ~/wview-save/var/lib/wview/archive/*.* /var/lib/wview/archive 
 #> sudo cp -rf ~/wview-save/etc/wview/* /etc/wview 
 #> sudo wviewconfig 
 (or use wviewmgmt to update the generation and html paths) 
@@ -849,10 +849,10 @@
 
 <td>
 wview Run Environment: 
- Configuration: /usr/local/etc/wview 
- Data: /usr/local/var/wview 
- wviewmgmt: /usr/local/var/wviewmgmt linked at /var/www/wviewmgmt 
- Weather web site: /usr/local/var/wview/img linked at /var/www/weather
+ Configuration: /etc/wview 
+ Data: /var/lib/wview 
+ wviewmgmt: /var/lib/wviewmgmt linked at /var/www/wviewmgmt 
+ Weather web site: /var/lib/wview/img linked at /var/www/weather
 </td>
 
 </tr>
@@ -992,9 +992,9 @@
 wview Run Environment: 
 Configuration: /opt/local/etc/wview 
 
- Data: /opt/local/var/wview 
- wviewmgmt: /opt/local/var/wviewmgmt 
- Weather web site: /opt/local/var/wview/img
+ Data: /opt/local/var/lib/wview 
+ wviewmgmt: /opt/local/var/lib/wviewmgmt 
+ Weather web site: /opt/local/var/lib/wview/img
 </td>
 </tr>
 </table>
@@ -1069,7 +1069,7 @@
 
 <ul>
 <li>Whatever "--prefix" you select during the configure step (default = 
- /usr/local), the wview start scripts are automatically updated to include
+ /usr), the wview start scripts are automatically updated to include
 the proper prefix for binary file and run directories.</li>
 <li>You should use the same prefix specification when configuring 
 radlib and wview. Further, this should be the default install location 
@@ -1171,7 +1171,7 @@
 
 
 For purposes of these instructions, the following conventions are used: 
- [wview_bld_path] is the staging area for building wview (i.e., /usr/local/src). 
+ [wview_bld_path] is the staging area for building wview (i.e., /usr/src). 
 wview-x.y.z is the version of wview you are installing. 
 
 
@@ -1207,7 +1207,7 @@
 
 Important configure options: 
 <blockquote>
- --prefix&nbsp;&nbsp;&nbsp;(default: /usr/local) Controls 
+ --prefix&nbsp;&nbsp;&nbsp;(default: /usr) Controls 
 the installation root for wview. 
 --enable-http&nbsp;&nbsp;&nbsp;(default: disabled) enables 
 inclusion of the HTTP services daemon. 
@@ -1342,12 +1342,12 @@
 <li>Add radlib location to shared library cache: 
 If you get errors similar to: 
 
- /usr/local/bin/wviewd: error while loading shared libraries: 
+ /usr/bin/wviewd: error while loading shared libraries: 
 ibrad.so.0: cannot open shared object file: No such file or directory 
 you need to either copy the latest wview start script from the distro
 (examples/[your_distro]/wview) to your start script location (see the 
 preceeding section), or add the radlib shared library location 
- (/usr/local/lib) to your shared library cache (see /etc/ld.so.conf) 
+ (/usr/lib) to your shared library cache (see /etc/ld.so.conf) 
 and run ldconfig.
 </li>
 </ol>
@@ -1357,10 +1357,10 @@
 
 <td>
 wview Run Environment: 
- Configuration: /usr/local/etc/wview 
- Data: /usr/local/var/wview 
- wviewmgmt: /usr/local/var/wviewmgmt linked at /var/www/wviewmgmt 
- Weather web site: /usr/local/var/wview/img linked at /var/www/weather
+ Configuration: /etc/wview 
+ Data: /var/lib/wview 
+ wviewmgmt: /var/lib/wviewmgmt linked at /var/www/wviewmgmt 
+ Weather web site: /var/lib/wview/img linked at /var/www/weather
 </td>
 
 </tr>
@@ -1533,7 +1533,7 @@
 For OSX MacPorts install: already linked properly 
 
 For source install: wviewmgmt will be installed at: 
- $prefix/var/wviewmgmt 
+ /var/lib/wviewmgmt 
 ($prefix was specified during the "configure" step) 
 You may need to soft link that location in your http document root: 
 
@@ -1541,7 +1541,7 @@
 <tr>
 
 <td>
- #> sudo ln -s $prefix/var/wviewmgmt [your_document_root]/wviewmgmt 
+ #> sudo ln -s /var/lib/wviewmgmt [your_document_root]/wviewmgmt 
 (of course replacing $prefix and [your_document_root] appropriately)
 </td>
 </tr>
@@ -1914,7 +1914,7 @@
 In order to set these parameters in the VP console, the "vpinstall" script is
 provided with the wview distribution. Note that all of these can be configured 
 using the On-Screen VP console setup utility. After building and installing wview, 
- the vpinstall script can be found in ${exec-prefix}/bin (usually /usr/local/bin). It 
+ the vpinstall script can be found in ${exec-prefix}/bin (usually /usr/bin). It 
 is an interactive script which queries you for these initial values then uses the
 vpconfig utility to commit them to your new VP console. Once completed, it is
 advisable to wait 10 minutes or so before starting wview for the first time as
@@ -2007,7 +2007,7 @@
 (using vpinstall). This will skew your rain season totals or 
 render your archived data unusable. If you do change the archive 
 interval after records have been stored by wview, you will need 
- to delete all archive data in $prefix/var/wview/archive/wview-archive.sdb
+ to delete all archive data in /var/lib/wview/archive/wview-archive.sdb
 before restarting wview. 
 Note 2: You MUST stop wview before using vpconfig to view or change 
 settings! 
@@ -2301,7 +2301,7 @@
 
 For any template file named "example.[ext]x" and listed in html-templates.conf,
 wview will generate a file named "example.[ext]". For example, "myscript.phpx"
- listed in html-templates.conf and found in $prefix/var/wview/html will have 
+ listed in html-templates.conf and found in /var/lib/wview/html will have 
 all wview tags replaced and the resulting file will be named "myscript.php".
 The resulting files are stored at the location specified on the wviewmgmt
 File Generation page: "Generation Target Path". 
@@ -2340,7 +2340,7 @@
 <table border="1" bgcolor="#d8d8d8" width="65%" cellspacing="0" cellpadding="2">
 <tr>
 <td>
- #> sudo kill -s HUP `cat $prefix/var/wview/htmlgend.pid`
+ #> sudo kill -s HUP `cat /var/lib/wview/htmlgend.pid`
 </td>
 
 </tr>
@@ -2547,7 +2547,7 @@
 from the command line and issue "ftp> pwd" to find out what the base
 directory on the remote host is.</li>
 <li>Local files do not exist: if you specify "Archive/*.txt" in an FTP
- rule as the source, if $prefix/var/wview/img/Archive is empty or
+ rule as the source, if /var/lib/wview/img/Archive is empty or
 does not exist, this transfer will obviously fail.</li>
 <li>Conflicting rule definitions: it is possible to define rules and 
 update intervals such that a file with a longer update interval may
@@ -2567,7 +2567,7 @@
 transfer files in your defined rules which are newer than that date. This
 conserves time and bandwidth. To cause the wview ftp service to start over,
 resending all files in your defined rules, you must delete the marker file:
- $prefix/var/wview/ftp_marker. wview will send all files and save the new
+ /var/lib/wview/ftp_marker. wview will send all files and save the new
 marker file at the next defined update interval.
 
 
@@ -2795,14 +2795,14 @@
 
 Confirming rsync Functionality 
 
- Place files in $prefix/var/wview/img (if it is not already your 
+ Place files in /var/lib/wview/img (if it is not already your 
 "Generation Target Path" on the wviewmgmt File Generation page):
 
 
 <table border="1" bgcolor="#d8d8d8" width="65%" cellspacing="0" cellpadding="2">
 <tr>
 <td>
- root@[wview_server]:# cp [some_test_files] $prefix/var/wview/img
+ root@[wview_server]:# cp [some_test_files] /var/lib/wview/img
 </td>
 </tr>
 </table>
@@ -2842,7 +2842,7 @@
 <table border="1" bgcolor="#d8d8d8" width="65%" cellspacing="0" cellpadding="2">
 <tr>
 <td>
- root@[wview_server]:# rsync -aqz --rsh=ssh $prefix/var/wview/img/ [remote_host]:[remote_test_dir]
+ root@[wview_server]:# rsync -aqz --rsh=ssh /var/lib/wview/img/ [remote_host]:[remote_test_dir]
 </td>
 </tr>
 </table>
@@ -2850,7 +2850,7 @@
 
 
 
- This should transfer the files you placed in $prefix/var/wview/img to the 
+ This should transfer the files you placed in /var/lib/wview/img to the 
 remote server in the [remote_test_dir] directory without a password
 being required. If it prompts for a password, you need to fix it. Left
 in this state, the wview ssh daemon will not provide any negative feedback
@@ -2893,10 +2893,10 @@
 
 
 wview stores archive data in an SQLite3 database, namely 
- $prefix/var/wview/archive/wview-archive.sdb. This allows easy data viewing, 
+ /var/lib/wview/archive/wview-archive.sdb. This allows easy data viewing, 
 modifying and post-processing. 
- HILOW data is stored in the database $prefix/var/wview/archive/wview-hilow.sdb. 
- NOAA data is stored in the database $prefix/var/wview/archive/wview-noaa.sdb. 
+ HILOW data is stored in the database /var/lib/wview/archive/wview-hilow.sdb. 
+ NOAA data is stored in the database /var/lib/wview/archive/wview-noaa.sdb. 
 This section will describe each of these databases including when and from 
 what data they are created/updated.
 
@@ -2948,17 +2948,17 @@
 Usage: wlk2sqlite source_directory [destination_directory] 
 source_directory is a required argument but can be the same as 
 [destination_directory] - typically you can use the default archive 
- file location for your installation, $prefix/var/wview/archive, since there 
+ file location for your installation, /var/lib/wview/archive, since there 
 is nothing destructive about the conversion with respect to the old 
 WLK files, it only reads them. 
- So an example using the default prefix /usr/local would be: 
+ So an example using the default prefix /usr would be: 
 
 
 <table border="1" bgcolor="#d8d8d8" width="65%" cellspacing="0" cellpadding="2">
 <tr>
 
 <td>
- #> sudo wlk2sqlite /usr/local/var/wview/archive
+ #> sudo wlk2sqlite /var/lib/wview/archive
 </td>
 </tr>
 </table>
@@ -2979,7 +2979,7 @@
 
 <tr>
 <td>
- #> sudo sqlite3 /usr/local/var/wview/archive/wview-archive.sdb 
+ #> sudo sqlite3 /var/lib/wview/archive/wview-archive.sdb 
 sqlite> .help 
 (This displays available commands; non-SQL commands begin with '.') 
 sqlite> select * from archive; 
@@ -3011,7 +3011,7 @@
 <tr>
 <td>
 Dump the archive table in SQL format: 
- #> sudo sqlite3 /usr/local/var/wview/archive/wview-archive.sdb .dump > ~/temp/[my_sql_filename] 
+ #> sudo sqlite3 /var/lib/wview/archive/wview-archive.sdb .dump > ~/temp/[my_sql_filename] 
 
 
 Copy [my_sql_filename] to the target platform. 
@@ -3036,17 +3036,17 @@
 
 HILOW Data 
 Overview 
- The database $prefix/var/wview/archive/wview-hilow.sdb will be created 
+ The database /var/lib/wview/archive/wview-hilow.sdb will be created 
 and back-filled using archive records for all records in the archive 
 database. 
 This initialization process can take some time (8-12 minutes per year) 
 but is only required during the first run of wview after an upgrade >= 
 5.1.0. 
- Once $prefix/var/wview/archive/wview-hilow.sdb has been created and 
+ Once /var/lib/wview/archive/wview-hilow.sdb has been created and 
 back-filled, wview will add each LOOP sample to the HILOW database. 
 
 Structure 
- The $prefix/var/wview/archive/wview-hilow.sdb database has one table 
+ The /var/lib/wview/archive/wview-hilow.sdb database has one table 
 for each of the supported sensor types (i.e., inTemp, outTemp, ... 
 rain, rainRate). Each table contains a record for each hour. The data 
 starts with your earliest archive record. 
@@ -3086,7 +3086,7 @@
 <td>
 		<pre>
 #> /etc/init.d/wview stop
-#> sudo rm $prefix/var/wview/archive/wview-hilow.sdb
+#> sudo rm /var/lib/wview/archive/wview-hilow.sdb
 #> /etc/init.d/wview start</pre>
 </td>
 </tr>
@@ -3140,7 +3140,7 @@
 
 	 <pre>
 #> /etc/init.d/wview stop
-#> sudo rm $prefix/var/wview/archive/wview-noaa.sdb
+#> sudo rm /var/lib/wview/archive/wview-noaa.sdb
 #> /etc/init.d/wview start</pre>
 </td>
 </tr>
@@ -3168,7 +3168,7 @@
 <td>
 	 <pre>
 #> /etc/init.d/wview stop
-#> sudo rm $prefix/var/wview/archive/wview-history.sdb
+#> sudo rm /var/lib/wview/archive/wview-history.sdb
 #> /etc/init.d/wview start</pre>
 </td>
 </tr>
@@ -3605,7 +3605,7 @@
 If using custom binaries, make note of the arguments passed to the binary
 above. 
 The example scripts log alarm events to a log file: 
- $prefix/var/wview/alarms/alarm.log. This may be a feature you want to keep -
+ /var/lib/wview/alarms/alarm.log. This may be a feature you want to keep -
 even if you are doing other things in your alarm notification scripts. 
 Alarm Type Definitions 
 
@@ -3662,7 +3662,7 @@
 <table border="1" bgcolor="#d8d8d8" width="65%" cellspacing="0" cellpadding="2">
 <tr>
 <td>
- #> tail -f $prefix/var/wview/alarms/alarm.log
+ #> tail -f /var/lib/wview/alarms/alarm.log
 </td>
 </tr>
 </table>
@@ -3988,8 +3988,8 @@
 1,6,11,16,21,26,31,36,41,46,51,56 * * * * $exec_prefix/wview-mysql-export 
 This runs the wview-mysql-export script every 5 minutes (1 minute past 
 archive record reception for 5 minute archive interval) 
- Example where $exec_prefix is "/usr/local/bin": 
- 1,6,11,16,21,26,31,36,41,46,51,56 * * * * /usr/local/bin/wview-mysql-export 
+ Example where $exec_prefix is "/usr/bin": 
+ 1,6,11,16,21,26,31,36,41,46,51,56 * * * * /usr/bin/wview-mysql-export 
 </td>
 </tr>
 </table>
@@ -4066,7 +4066,7 @@
 directory. </li>
 <li>Execution of wlk2sqlite may require modifying the dynamic library load
 path, i.e.: 
- >export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib 
+ >export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib 
 You'll know you need this if trying to execute wlk2sqlite produces the 
 following message: 
 *wlk2sqlite: error while loading shared libraries: librad.so.0: 
@@ -4095,7 +4095,7 @@
 generates new image and html files.
 </pre> 
 
- Data Files ($prefix/var/wview) 
+ Data Files (/var/lib/wview) 
 
 
 <pre>
@@ -4275,21 +4275,21 @@
 
 <pre>
 root@localhost:/root# ps aux | grep wv
- root 73863 0.0 0.2 2320 1808 ?? Ss 7:08AM 0:00.02 /usr/local/bin/radmrouted 1 $prefix/var/wview
- root 73865 0.0 0.2 2300 1780 ?? I 7:08AM 0:00.00 /usr/local/bin/radmrouted 1 $prefix/var/wview
- root 73868 0.0 0.1 2380 1472 ?? Ss 7:08AM 0:00.36 /usr/local/bin/wviewd
- root 73870 0.0 0.1 2356 1196 ?? I 7:08AM 0:00.00 /usr/local/bin/wviewd
- root 73873 0.0 0.1 2376 1524 ?? Is 7:08AM 0:35.43 /usr/local/bin/wviewsqld
- root 73875 0.0 0.1 2324 1140 ?? I 7:08AM 0:00.00 /usr/local/bin/wviewsqld
- root 73879 0.0 0.1 2336 1468 ?? Ss 7:08AM 0:00.01 /usr/local/bin/wvalarmd
- root 73881 0.0 0.1 2312 1136 ?? I 7:08AM 0:00.00 /usr/local/bin/wvalarmd
- root 73882 0.0 0.1 2392 1504 ?? Is 7:08AM 0:00.01 /usr/local/bin/wvcwopd
- root 73884 0.0 0.1 2304 1136 ?? I 7:08AM 0:00.00 /usr/local/bin/wvcwopd
- root 73885 0.0 0.3 4944 3100 ?? Is 7:08AM 0:00.03 /usr/local/bin/wvhttpd
- root 73886 0.0 0.2 4788 2216 ?? I 7:08AM 0:00.00 /usr/local/bin/wvhttpd
+ root 73863 0.0 0.2 2320 1808 ?? Ss 7:08AM 0:00.02 /usr/bin/radmrouted 1 /var/lib/wview
+ root 73865 0.0 0.2 2300 1780 ?? I 7:08AM 0:00.00 /usr/bin/radmrouted 1 /var/lib/wview
+ root 73868 0.0 0.1 2380 1472 ?? Ss 7:08AM 0:00.36 /usr/bin/wviewd
+ root 73870 0.0 0.1 2356 1196 ?? I 7:08AM 0:00.00 /usr/bin/wviewd
+ root 73873 0.0 0.1 2376 1524 ?? Is 7:08AM 0:35.43 /usr/bin/wviewsqld
+ root 73875 0.0 0.1 2324 1140 ?? I 7:08AM 0:00.00 /usr/bin/wviewsqld
+ root 73879 0.0 0.1 2336 1468 ?? Ss 7:08AM 0:00.01 /usr/bin/wvalarmd
+ root 73881 0.0 0.1 2312 1136 ?? I 7:08AM 0:00.00 /usr/bin/wvalarmd
+ root 73882 0.0 0.1 2392 1504 ?? Is 7:08AM 0:00.01 /usr/bin/wvcwopd
+ root 73884 0.0 0.1 2304 1136 ?? I 7:08AM 0:00.00 /usr/bin/wvcwopd
+ root 73885 0.0 0.3 4944 3100 ?? Is 7:08AM 0:00.03 /usr/bin/wvhttpd
+ root 73886 0.0 0.2 4788 2216 ?? I 7:08AM 0:00.00 /usr/bin/wvhttpd
 root@localhost:/root# ps aux | grep htmlgen
- root 73876 0.0 0.3 3960 2800 ?? Is 7:08AM 0:05.82 /usr/local/bin/htmlgend
- root 73878 0.0 0.2 3860 1964 ?? I 7:08AM 0:00.00 /usr/local/bin/htmlgend
+ root 73876 0.0 0.3 3960 2800 ?? Is 7:08AM 0:05.82 /usr/bin/htmlgend
+ root 73878 0.0 0.2 3860 1964 ?? I 7:08AM 0:00.00 /usr/bin/htmlgend
 root@localhost:/root#
 </pre> 
 
@@ -4419,8 +4419,8 @@
 starting up wview. You should also when you first install it. Informational 
 logs can later be disabled using the wviewmgmt web interface (Services page)
 then sending a HUP signal to wviewd and htmlgend: 
- (kill -s HUP `cat $prefix/var/wview/wviewd.pid`) and 
- (kill -s HUP `cat $prefix/var/wview/htmlgend.pid`) respectively. 
+ (kill -s HUP `cat /var/lib/wview/wviewd.pid`) and 
+ (kill -s HUP `cat /var/lib/wview/htmlgend.pid`) respectively. 
 If you have errors in your startup log, you will need to stop all wview 
 daemons using the wview start script (/etc/init.d/wview stop). These are 
 independent processes which will not shut down automatically if there is
@@ -4431,7 +4431,7 @@
 
 <pre>
 Apr 18 08:48:44 linuxquad radmrouted[11676]: <1240062524756> : radlib: radmrouted started as a daemon ...
- Apr 18 08:48:44 linuxquad radmrouted[11676]: <1240062524764> : started on radlib system 1, workdir /usr/local/var/wview
+ Apr 18 08:48:44 linuxquad radmrouted[11676]: <1240062524764> : started on radlib system 1, workdir /var/lib/wview
 Apr 18 08:48:44 linuxquad radmrouted[11676]: <1240062524764> : running... 
 Apr 18 08:48:45 linuxquad wviewd[11680]: <1240062525759> : radlib: wviewd started as a daemon ... 
 Apr 18 08:48:45 linuxquad wviewd[11680]: <1240062525759> : wview 5.4.0 starting ... 
@@ -4460,8 +4460,8 @@
 Apr 18 08:48:46 linuxquad wviewd[11680]: <1240062526055> : newest archive record: 2009-04-14 22:40 
 Apr 18 08:48:46 linuxquad htmlgend[11686]: <1240062526745> : radlib: htmlgend started as a daemon ... 
 Apr 18 08:48:46 linuxquad wvalarmd[11691]: <1240062526746> : radlib: wvalarmd started as a daemon ... 
- Apr 18 08:48:46 linuxquad htmlgend[11686]: <1240062526746> : generating to /usr/local/var/wview/img 
- Apr 18 08:48:46 linuxquad htmlgend[11686]: <1240062526746> : templates at /usr/local/etc/wview/html 
+ Apr 18 08:48:46 linuxquad htmlgend[11686]: <1240062526746> : generating to /var/lib/wview/img 
+ Apr 18 08:48:46 linuxquad htmlgend[11686]: <1240062526746> : templates at /etc/wview/html 
 Apr 18 08:48:46 linuxquad htmlgend[11686]: <1240062526747> : !! Dual units will be displayed !! 
 Apr 18 08:48:46 linuxquad htmlgend[11686]: <1240062526747> : Tag Search red-black tree: max black node tree height: 7 
 Apr 18 08:48:46 linuxquad wvalarmd[11691]: <1240062526747> : ALARM daemon not enabled - exiting... 
@@ -4477,20 +4477,20 @@
 Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: htmlgend: 0 
 Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: htmlgend process monitoring is disabled 
 Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: wvalarmd: 120 
- Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: pid file /usr/local/var/wview/wvalarmd.pid not present, disable monitoring... 
+ Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: pid file /var/lib/wview/wvalarmd.pid not present, disable monitoring... 
 Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: wvcwopd: 120 
- Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: pid file /usr/local/var/wview/wvcwopd.pid not present, disable monitoring... 
+ Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: pid file /var/lib/wview/wvcwopd.pid not present, disable monitoring... 
 Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: wvhttpd: 120 
- Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: pid file /usr/local/var/wview/wvhttpd.pid not present, disable monitoring... 
+ Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: pid file /var/lib/wview/wvhttpd.pid not present, disable monitoring... 
 Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: wviewsqld: 600 
- Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: pid file /usr/local/var/wview/wviewsqld.pid not present, disable monitoring... 
+ Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : PMON: pid file /var/lib/wview/wviewsqld.pid not present, disable monitoring... 
 Apr 18 08:48:46 linuxquad wvpmond[11711]: <1240062526829> : running... 
 Apr 18 08:48:47 linuxquad htmlgend[11686]: <1240062527294> : running... 
 Apr 18 08:48:47 linuxquad htmlgend[11686]: <1240062527294> : received station info from wviewd: 20090414 22:40:00 
 Apr 18 08:48:47 linuxquad htmlgend[11686]: <1240062527298> : htmlmgrInit: 51 built-in image definitions added 
 Apr 18 08:48:47 linuxquad htmlgend[11686]: <1240062527306> : htmlmgrInit: 0 user image definitions added 
 Apr 18 08:48:47 linuxquad htmlgend[11686]: <1240062527314> : htmlmgrInit: 14 templates added 
- Apr 18 08:48:47 linuxquad htmlgend[11686]: <1240062527314> : htmlmgrInit: forecast html tags are disabled - /usr/local/etc/wview/forecast.conf not found... 
+ Apr 18 08:48:47 linuxquad htmlgend[11686]: <1240062527314> : htmlmgrInit: forecast html tags are disabled - /etc/wview/forecast.conf not found... 
 Apr 18 08:48:47 linuxquad htmlgend[11686]: <1240062527316> : initializing barometric pressure trend 
 Apr 18 08:48:47 linuxquad htmlgend[11686]: <1240062527316> : initializing historical stores (this may take some time...) 
 Apr 18 08:48:47 linuxquad htmlgend[11686]: <1240062527316> : htmlHistoryInit: DAY: samples=0 
@@ -4575,13 +4575,13 @@
 for each daemon: 
 
 <pre>
- kill -s HUP `cat $prefix/var/wview/wviewd.pid`
- kill -s HUP `cat $prefix/var/wview/htmlgend.pid`
- kill -s HUP `cat $prefix/var/wview/wviewftpd.pid`
- kill -s HUP `cat $prefix/var/wview/wviewsshd.pid`
- kill -s HUP `cat $prefix/var/wview/wvalarmd.pid`
- kill -s HUP `cat $prefix/var/wview/wvcwopd.pid`
- kill -s HUP `cat $prefix/var/wview/wvhttpd.pid`
+ kill -s HUP `cat /var/lib/wview/wviewd.pid`
+ kill -s HUP `cat /var/lib/wview/htmlgend.pid`
+ kill -s HUP `cat /var/lib/wview/wviewftpd.pid`
+ kill -s HUP `cat /var/lib/wview/wviewsshd.pid`
+ kill -s HUP `cat /var/lib/wview/wvalarmd.pid`
+ kill -s HUP `cat /var/lib/wview/wvcwopd.pid`
+ kill -s HUP `cat /var/lib/wview/wvhttpd.pid`
 </pre>
 
 
@@ -4673,7 +4673,7 @@
 <table border="1" bgcolor="#d8d8d8" width="65%" cellspacing="0" cellpadding="2">
 <tr>
 <td>
- #> raddebug 1 $prefix/var/wview 
+ #> raddebug 1 /var/lib/wview 
 </td>
 </tr>
 </table>

Places

File wview-directories-5.18.1.diff of Package wview (Revision c3cf3a4d7ece0d86ed0a1ad112aa95bf)

Places