Fix makefile

This commit is contained in:
jun7 2023-02-12 11:21:33 +09:00
commit ab4df02cff
3 changed files with 15 additions and 25 deletions

View File

@ -1,17 +0,0 @@
# Maintainer: jun7 <jun7@hush.com>
pkgname=wyebadblock-vimb
pkgver=1
pkgrel=1
pkgdesc="adblock link to wyebadblock for vimb."
arch=('x86_64')
url="https://github.com/jun7/wyebadblock"
license=('GPL3')
depends=('wyebadblock-git' 'vimb')
makedepends=()
source=()
package() {
mkdir -p "$pkgdir/usr/lib/vimb"
ln -s /usr/lib/wyebrowser/adblock.so "$pkgdir/usr/lib/vimb"
}

View File

@ -26,6 +26,11 @@ wyebadblock only checks 'easylist.txt'
You can check whether wyebab has found easylist.txt by `wyebab --css` You can check whether wyebab has found easylist.txt by `wyebab --css`
## for webkit2gtk-4.1
WEBKITVER=4.1 make
sudo WEBKITVER=4.1 make install
Make sure this adds a dir 4.1/ before the adblock.so
## Addition for other webkit2gtk browsers ## Addition for other webkit2gtk browsers
webkit2gtk loads extensions in a dir designated by each apps. webkit2gtk loads extensions in a dir designated by each apps.
So we have to make a link to wyebab in the dir. So we have to make a link to wyebab in the dir.
@ -53,9 +58,7 @@ There is a PKGBUILD file. see the 'PKGBULDs' dir.
### vimb ### vimb
sudo ln -s /usr/lib/wyebrowser/adblock.so /usr/lib/vimb sudo ln -s /usr/lib/wyebrowser/4.1/adblock.so /usr/lib/vimb
There is a PKGBUILD file. see the 'PKGBULDs' dir.
If the path doesn't work, check https://fanglingsu.github.io/vimb/howto.html#block If the path doesn't work, check https://fanglingsu.github.io/vimb/howto.html#block

View File

@ -1,9 +1,13 @@
LISTNAME=easylist.txt LISTNAME=easylist.txt
PREFIX ?= /usr PREFIX ?= /usr
WEBKIT ?= webkit2gtk-4.1 WEBKITVER ?= 4.0
WEBKIT ?= webkit2gtk-$(WEBKITVER)
APPDIR ?= wyebrowser APPDIR ?= wyebrowser
APPVER ?= /4.1
EXTENSION_DIR ?= $(PREFIX)/lib/$(APPDIR) EXTENSION_DIR ?= $(PREFIX)/lib/$(APPDIR)
ifneq ($(WEBKITVER), 4.0)
VERDIR=/$(WEBKITVER)
endif
ifeq ($(DEBUG), 1) ifeq ($(DEBUG), 1)
CFLAGS += -Wall CFLAGS += -Wall
else else
@ -42,12 +46,12 @@ clean:
install: install:
install -Dm755 wyebab $(DESTDIR)$(PREFIX)/bin/wyebab install -Dm755 wyebab $(DESTDIR)$(PREFIX)/bin/wyebab
install -Dm755 adblock.so $(DESTDIR)$(EXTENSION_DIR)$(APPVER)/adblock.so install -Dm755 adblock.so $(DESTDIR)$(EXTENSION_DIR)$(VERDIR)/adblock.so
uninstall: uninstall:
rm -f $(PREFIX)/bin/wyebab rm -f $(PREFIX)/bin/wyebab
rm -f $(EXTENSION_DIR)$(APPVER)/adblock.so rm -f $(EXTENSION_DIR)$(VERDIR)/adblock.so
-rmdir $(EXTENSION_DIR)$(APPVER) -rmdir $(EXTENSION_DIR)$(VERDIR)
-rmdir $(EXTENSION_DIR) -rmdir $(EXTENSION_DIR)