package: avoid use of GLUONDIR variable
This commit is contained in:
		
							parent
							
								
									850499fdb3
								
							
						
					
					
						commit
						2dd8a700ca
					
				| @ -6,7 +6,7 @@ PKG_RELEASE:=1 | |||||||
| 
 | 
 | ||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| define Package/gluon-alfred | define Package/gluon-alfred | ||||||
|  | |||||||
| @ -5,7 +5,7 @@ PKG_VERSION:=2 | |||||||
| 
 | 
 | ||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| define Package/gluon-authorized-keys | define Package/gluon-authorized-keys | ||||||
|  | |||||||
| @ -7,7 +7,7 @@ PKG_RELEASE:=$(GLUON_BRANCH) | |||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| PKG_BUILD_DEPENDS := respondd | PKG_BUILD_DEPENDS := respondd | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| define Package/gluon-autoupdater | define Package/gluon-autoupdater | ||||||
|  | |||||||
| @ -5,7 +5,7 @@ PKG_VERSION:=1 | |||||||
| 
 | 
 | ||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| define Package/gluon-client-bridge | define Package/gluon-client-bridge | ||||||
|  | |||||||
| @ -5,7 +5,7 @@ PKG_VERSION:=1 | |||||||
| 
 | 
 | ||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) | PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -5,7 +5,7 @@ PKG_VERSION:=1 | |||||||
| 
 | 
 | ||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) | PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -8,7 +8,7 @@ PKG_VERSION:=2 | |||||||
| 
 | 
 | ||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) | PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -5,7 +5,7 @@ PKG_VERSION:=1 | |||||||
| 
 | 
 | ||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) | PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -5,7 +5,7 @@ PKG_VERSION:=1 | |||||||
| 
 | 
 | ||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) | PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -5,7 +5,7 @@ PKG_VERSION:=2 | |||||||
| 
 | 
 | ||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) | PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -6,7 +6,7 @@ PKG_RELEASE:=$(GLUON_VERSION) | |||||||
| 
 | 
 | ||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| define Package/gluon-core | define Package/gluon-core | ||||||
|  | |||||||
| @ -5,7 +5,7 @@ PKG_VERSION:=2 | |||||||
| 
 | 
 | ||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| define Package/gluon-legacy | define Package/gluon-legacy | ||||||
|  | |||||||
| @ -9,7 +9,7 @@ PKG_RELEASE:=1 | |||||||
| 
 | 
 | ||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) | PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -9,7 +9,7 @@ PKG_RELEASE:=1 | |||||||
| 
 | 
 | ||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) | PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -6,7 +6,7 @@ PKG_RELEASE:=1 | |||||||
| 
 | 
 | ||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) | PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -6,7 +6,7 @@ PKG_RELEASE:=1 | |||||||
| 
 | 
 | ||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) | PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -9,7 +9,7 @@ PKG_RELEASE:=1 | |||||||
| 
 | 
 | ||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) | PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -6,7 +6,7 @@ PKG_RELEASE:=1 | |||||||
| 
 | 
 | ||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) | PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -9,7 +9,7 @@ PKG_RELEASE:=1 | |||||||
| 
 | 
 | ||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| define Package/gluon-luci-theme | define Package/gluon-luci-theme | ||||||
|  | |||||||
| @ -6,7 +6,7 @@ PKG_RELEASE:=1 | |||||||
| 
 | 
 | ||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) | PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -5,7 +5,7 @@ PKG_VERSION:=1 | |||||||
| 
 | 
 | ||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| define Package/gluon-mesh-batman-adv-14 | define Package/gluon-mesh-batman-adv-14 | ||||||
|  | |||||||
| @ -5,7 +5,7 @@ PKG_VERSION:=1 | |||||||
| 
 | 
 | ||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| define Package/gluon-mesh-batman-adv-15 | define Package/gluon-mesh-batman-adv-15 | ||||||
|  | |||||||
| @ -6,7 +6,7 @@ PKG_VERSION:=1 | |||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| PKG_BUILD_DEPENDS := respondd | PKG_BUILD_DEPENDS := respondd | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| define Package/gluon-mesh-batman-adv-core | define Package/gluon-mesh-batman-adv-core | ||||||
|  | |||||||
| @ -6,7 +6,7 @@ PKG_VERSION:=3 | |||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| PKG_BUILD_DEPENDS := respondd | PKG_BUILD_DEPENDS := respondd | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| define Package/gluon-mesh-vpn-fastd | define Package/gluon-mesh-vpn-fastd | ||||||
|  | |||||||
| @ -6,7 +6,7 @@ PKG_RELEASE:=1 | |||||||
| 
 | 
 | ||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| define Package/gluon-neighbour-info | define Package/gluon-neighbour-info | ||||||
|  | |||||||
| @ -7,7 +7,7 @@ PKG_RELEASE:=1 | |||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| PKG_BUILD_DEPENDS := respondd | PKG_BUILD_DEPENDS := respondd | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| define Package/gluon-node-info | define Package/gluon-node-info | ||||||
|  | |||||||
| @ -5,7 +5,7 @@ PKG_VERSION:=3 | |||||||
| 
 | 
 | ||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| define Package/gluon-radvd | define Package/gluon-radvd | ||||||
|  | |||||||
| @ -5,7 +5,7 @@ PKG_VERSION:=1 | |||||||
| 
 | 
 | ||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| define Package/gluon-respondd | define Package/gluon-respondd | ||||||
|  | |||||||
| @ -8,7 +8,7 @@ PKG_VERSION:=1 | |||||||
| 
 | 
 | ||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| define Package/gluon-setup-mode | define Package/gluon-setup-mode | ||||||
|  | |||||||
| @ -9,7 +9,7 @@ PKG_BUILD_DEPENDS := luci-base/host lua-cjson/host | |||||||
| 
 | 
 | ||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) | PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) | ||||||
| 
 | 
 | ||||||
| @ -28,7 +28,7 @@ define Build/Configure | |||||||
| endef | endef | ||||||
| 
 | 
 | ||||||
| define Build/Compile | define Build/Compile | ||||||
| 	lua -e 'print(require("cjson").encode(assert(dofile("$(GLUONDIR)/scripts/site_config.lua"))))' > $(PKG_BUILD_DIR)/site.json | 	lua -e 'print(require("cjson").encode(assert(dofile("../../scripts/site_config.lua"))))' > $(PKG_BUILD_DIR)/site.json | ||||||
| 	$(call GluonBuildI18N,gluon-site,$(GLUON_SITEDIR)/i18n) | 	$(call GluonBuildI18N,gluon-site,$(GLUON_SITEDIR)/i18n) | ||||||
| endef | endef | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -7,7 +7,7 @@ PKG_RELEASE:=1 | |||||||
| PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) | ||||||
| PKG_BUILD_DEPENDS := respondd | PKG_BUILD_DEPENDS := respondd | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| define Package/gluon-status-page-api | define Package/gluon-status-page-api | ||||||
|  | |||||||
| @ -5,7 +5,7 @@ PKG_VERSION:=1 | |||||||
| 
 | 
 | ||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| define Package/gluon-wan-dnsmasq | define Package/gluon-wan-dnsmasq | ||||||
|  | |||||||
| @ -8,7 +8,7 @@ PKG_LICENSE:=BSD-2-Clause | |||||||
| 
 | 
 | ||||||
| PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) | ||||||
| 
 | 
 | ||||||
| include $(GLUONDIR)/include/package.mk | include ../gluon.mk | ||||||
| include $(INCLUDE_DIR)/cmake.mk | include $(INCLUDE_DIR)/cmake.mk | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user