From a43b21117f120100b27d3c2bde39522e531883c9 Mon Sep 17 00:00:00 2001 From: KFERMercer Date: Thu, 23 Jan 2020 23:17:55 +0800 Subject: [PATCH] v2ray-core: fix directory error --- package/lean/v2ray-core/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package/lean/v2ray-core/Makefile b/package/lean/v2ray-core/Makefile index 41eb236407ea7..274a864c76077 100644 --- a/package/lean/v2ray-core/Makefile +++ b/package/lean/v2ray-core/Makefile @@ -53,6 +53,7 @@ PKG_CONFIG_DEPENDS := \ PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 + export GO111MODULE=on export GOPROXY=https://goproxy.cn @@ -242,6 +243,7 @@ endef define Build/Prepare $(call Build/Prepare/Default) + ifneq ($(CONFIG_V2RAY_EXCLUDE_ASSETS),y) # move file to make sure download new file every build mv -f $(DL_DIR)/$(GEOIP_FILE) $(PKG_BUILD_DIR)/release/config/geoip.dat @@ -277,21 +279,19 @@ endif endif endef -define Package/v2ray-core/install - $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) - - $(INSTALL_DIR) $(1)/usr/bin +define Package/v2ray/install + $(INSTALL_DIR) $(1)/usr/bin/v2ray - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/v2ray $(1)/usr/bin + $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/v2ray $(1)/usr/bin/v2ray ifneq ($(CONFIG_V2RAY_EXCLUDE_V2CTL),y) - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/v2ctl $(1)/usr/bin + $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/v2ctl $(1)/usr/bin/v2ray endif ifneq ($(CONFIG_V2RAY_EXCLUDE_ASSETS),y) $(INSTALL_DATA) \ $(PKG_BUILD_DIR)/release/config/{geoip,geosite}.dat \ - $(1)/usr/bin + $(1)/usr/bin/v2ray endif endef