squidguard: Fix conflicts after rebase against master with #4695

SynoCommunity · Oct 1, 2021 · 0f9ced3 · 0f9ced3
1 parent 7f5f9de
commit 0f9ced3
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/spk/squidguard/Makefile b/spk/squidguard/Makefile
@@ -48,8 +48,8 @@ xz-compress:
 	install -m 755 -d $(STAGING_SPKVAR)/db
 	install -m 755 src/update_db.sh $(STAGING_DIR)/bin/
 	install -m 755 src/etc/* $(STAGING_DIR)/etc/
-	install -m 644 src/app/config $(STAGING_DIR)/var/www/squidguardmgr/
-	install -m 755 src/app/squidGuard.cgi $(STAGING_DIR)/var/www/squidguardmgr/
-	install -m 644 src/app/babel.* $(STAGING_DIR)/var/www/squidguardmgr/
-	install -m 644 src/app/synocommunity.png $(STAGING_DIR)/var/www/squidguardmgr/
-	install -m 644 src/app/blocked.gif $(STAGING_DIR)/var/www/squidguardmgr/
+	install -m 644 src/app/config $(STAGING_SPKVAR)/www/squidguardmgr/
+	install -m 755 src/app/squidGuard.cgi $(STAGING_SPKVAR)/www/squidguardmgr/
+	install -m 644 src/app/babel.* $(STAGING_SPKVAR)/www/squidguardmgr/
+	install -m 644 src/app/synocommunity.png $(STAGING_SPKVAR)/www/squidguardmgr/
+	install -m 644 src/app/blocked.gif $(STAGING_SPKVAR)/www/squidguardmgr/