From 0f9ced3740c8df7dc710da38a20478719af59c90 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Fri, 1 Oct 2021 12:01:47 +0000 Subject: [PATCH] squidguard: Fix conflicts after rebase against master with #4695 --- spk/squidguard/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spk/squidguard/Makefile b/spk/squidguard/Makefile index 1dccb00bd22b..0b41a7f4e356 100644 --- 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/