Merge branch 'master' of github.com:weewx/weewx

This commit is contained in:
Matthew Wall
2015-06-21 21:54:52 -04:00
2 changed files with 2 additions and 2 deletions

View File

@@ -60,7 +60,7 @@ install: build
-e 's%^WEEWX_ROOT =.*%WEEWX_ROOT = /%' \
-e 's%SKIN_ROOT =.*%SKIN_ROOT = /etc/weewx/skins%' \
-e 's%HTML_ROOT =.*%HTML_ROOT = /var/www/weewx%' \
-e 's%archive/weewx.sdb%/var/lib/weewx/weewx.sdb%' \
-e 's%SQLITE_ROOT = .*%SQLITE_ROOT = /var/lib/weewx%' \
> $(DST_CFGDIR)/weewx.conf
cat $(SRC)/util/init.d/weewx.debian | sed \
-e 's%WEEWX_BIN=.*%WEEWX_BIN=/usr/bin/weewxd%' \

View File

@@ -92,7 +92,7 @@ cat weewx.conf | sed \
-e 's%^WEEWX_ROOT =.*%WEEWX_ROOT = /%' \
-e 's%SKIN_ROOT =.*%SKIN_ROOT = /etc/weewx/skins%' \
-e 's%HTML_ROOT =.*%HTML_ROOT = /var/www/html/weewx%' \
-e 's%archive/weewx.sdb%/var/lib/weewx/weewx.sdb%' \
-e 's%SQLITE_ROOT = .*%SQLITE_ROOT = /var/lib/weewx%' \
> %{buildroot}%{dst_cfg_dir}/weewx.conf
cat util/init.d/weewx.%{platform} | sed \
-e 's%WEEWX_BIN=.*%WEEWX_BIN=/usr/bin/weewxd%' \