From 507c0ff6335f38566162901fb756bb642e2d60e8 Mon Sep 17 00:00:00 2001 From: Matthew Wall Date: Sun, 21 Jun 2015 20:48:31 -0400 Subject: [PATCH] adapt rpm and deb to SQLITE_ROOT change --- pkg/debian/rules | 2 +- pkg/weewx.spec.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/debian/rules b/pkg/debian/rules index 6bffa438..74064f6a 100755 --- a/pkg/debian/rules +++ b/pkg/debian/rules @@ -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%' \ diff --git a/pkg/weewx.spec.in b/pkg/weewx.spec.in index 8ab03331..8f00ab85 100644 --- a/pkg/weewx.spec.in +++ b/pkg/weewx.spec.in @@ -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%' \