From 05398d4f961406f888c325504610430267bfdb47 Mon Sep 17 00:00:00 2001 From: "kali kaneko (leap communications)" Date: Fri, 23 Oct 2020 17:12:02 +0200 Subject: [pkg] relink vendor assets --- Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 395823e..0443b9b 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # (c) LEAP Encryption Access Project, 2019-2020 ######################################################################### -.PHONY: all get build icon locales generate_locales clean check_qtifw HAS-qtifw +.PHONY: all get build icon locales generate_locales clean check_qtifw HAS-qtifw relink_vendor XBUILD ?= no SKIP_CACHECK ?= no @@ -45,6 +45,7 @@ HAS_QTIFW := $(shell PATH=$(PATH) which binarycreator) endif OPENVPN_BIN = "$(HOME)/openvpn_build/sbin/$(shell grep OPENVPN branding/thirdparty/openvpn/build_openvpn.sh | head -n 1 | cut -d = -f 2 | tr -d '"')" + ######################################################################### # go build ######################################################################### @@ -87,9 +88,15 @@ endif lib/%.a: $(PKGFILES) @./gui/build.sh --just-golib +relink_vendor: +ifeq ($(VENDOR_PATH), providers) + @unlink providers/assets || true + @ln -s ${PROVIDER}/assets providers/assets +endif + build_golib: lib/libgoshim.a -build_gui: +build_gui: relink_vendor @XBUILD=no TARGET=${TARGET} VENDOR_PATH=${VENDOR_PATH} gui/build.sh --skip-golib build: build_golib build_helper build_gui -- cgit v1.2.3