From 2dd8a700ca9cc288dc4ea8abb261b8e210c446f6 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 9 Oct 2016 00:18:45 +0200 Subject: [PATCH] package: avoid use of GLUONDIR variable --- package/gluon-alfred/Makefile | 2 +- package/gluon-authorized-keys/Makefile | 2 +- package/gluon-autoupdater/Makefile | 2 +- package/gluon-client-bridge/Makefile | 2 +- package/gluon-config-mode-autoupdater/Makefile | 2 +- package/gluon-config-mode-contact-info/Makefile | 2 +- package/gluon-config-mode-core/Makefile | 2 +- package/gluon-config-mode-geo-location/Makefile | 2 +- package/gluon-config-mode-hostname/Makefile | 2 +- package/gluon-config-mode-mesh-vpn/Makefile | 2 +- package/gluon-core/Makefile | 2 +- package/gluon-legacy/Makefile | 2 +- package/gluon-luci-admin/Makefile | 2 +- package/gluon-luci-autoupdater/Makefile | 2 +- package/gluon-luci-mesh-vpn-fastd/Makefile | 2 +- package/gluon-luci-node-role/Makefile | 2 +- package/gluon-luci-portconfig/Makefile | 2 +- package/gluon-luci-private-wifi/Makefile | 2 +- package/gluon-luci-theme/Makefile | 2 +- package/gluon-luci-wifi-config/Makefile | 2 +- package/gluon-mesh-batman-adv-14/Makefile | 2 +- package/gluon-mesh-batman-adv-15/Makefile | 2 +- package/gluon-mesh-batman-adv-core/Makefile | 2 +- package/gluon-mesh-vpn-fastd/Makefile | 2 +- package/gluon-neighbour-info/Makefile | 2 +- package/gluon-node-info/Makefile | 2 +- package/gluon-radvd/Makefile | 2 +- package/gluon-respondd/Makefile | 2 +- package/gluon-setup-mode/Makefile | 2 +- package/gluon-site/Makefile | 4 ++-- package/gluon-status-page-api/Makefile | 2 +- package/gluon-wan-dnsmasq/Makefile | 2 +- include/package.mk => package/gluon.mk | 0 package/libgluonutil/Makefile | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) rename include/package.mk => package/gluon.mk (100%) diff --git a/package/gluon-alfred/Makefile b/package/gluon-alfred/Makefile index 01fbdf43..be0ff0da 100644 --- a/package/gluon-alfred/Makefile +++ b/package/gluon-alfred/Makefile @@ -6,7 +6,7 @@ PKG_RELEASE:=1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -include $(GLUONDIR)/include/package.mk +include ../gluon.mk define Package/gluon-alfred diff --git a/package/gluon-authorized-keys/Makefile b/package/gluon-authorized-keys/Makefile index 83eaf04f..7d010dc9 100644 --- a/package/gluon-authorized-keys/Makefile +++ b/package/gluon-authorized-keys/Makefile @@ -5,7 +5,7 @@ PKG_VERSION:=2 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -include $(GLUONDIR)/include/package.mk +include ../gluon.mk define Package/gluon-authorized-keys diff --git a/package/gluon-autoupdater/Makefile b/package/gluon-autoupdater/Makefile index baae06ba..41cdf796 100644 --- a/package/gluon-autoupdater/Makefile +++ b/package/gluon-autoupdater/Makefile @@ -7,7 +7,7 @@ PKG_RELEASE:=$(GLUON_BRANCH) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DEPENDS := respondd -include $(GLUONDIR)/include/package.mk +include ../gluon.mk define Package/gluon-autoupdater diff --git a/package/gluon-client-bridge/Makefile b/package/gluon-client-bridge/Makefile index cbd62a38..57d5b314 100644 --- a/package/gluon-client-bridge/Makefile +++ b/package/gluon-client-bridge/Makefile @@ -5,7 +5,7 @@ PKG_VERSION:=1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -include $(GLUONDIR)/include/package.mk +include ../gluon.mk define Package/gluon-client-bridge diff --git a/package/gluon-config-mode-autoupdater/Makefile b/package/gluon-config-mode-autoupdater/Makefile index ab5d1adc..2fe1ccb2 100644 --- a/package/gluon-config-mode-autoupdater/Makefile +++ b/package/gluon-config-mode-autoupdater/Makefile @@ -5,7 +5,7 @@ PKG_VERSION:=1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -include $(GLUONDIR)/include/package.mk +include ../gluon.mk PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) diff --git a/package/gluon-config-mode-contact-info/Makefile b/package/gluon-config-mode-contact-info/Makefile index 3ac8a0b3..7a3780a6 100644 --- a/package/gluon-config-mode-contact-info/Makefile +++ b/package/gluon-config-mode-contact-info/Makefile @@ -5,7 +5,7 @@ PKG_VERSION:=1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -include $(GLUONDIR)/include/package.mk +include ../gluon.mk PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) diff --git a/package/gluon-config-mode-core/Makefile b/package/gluon-config-mode-core/Makefile index 52a4f0e1..d629c265 100644 --- a/package/gluon-config-mode-core/Makefile +++ b/package/gluon-config-mode-core/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:=2 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -include $(GLUONDIR)/include/package.mk +include ../gluon.mk PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) diff --git a/package/gluon-config-mode-geo-location/Makefile b/package/gluon-config-mode-geo-location/Makefile index aa16ad06..af523f09 100644 --- a/package/gluon-config-mode-geo-location/Makefile +++ b/package/gluon-config-mode-geo-location/Makefile @@ -5,7 +5,7 @@ PKG_VERSION:=1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -include $(GLUONDIR)/include/package.mk +include ../gluon.mk PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) diff --git a/package/gluon-config-mode-hostname/Makefile b/package/gluon-config-mode-hostname/Makefile index 6e30466d..2b24a640 100644 --- a/package/gluon-config-mode-hostname/Makefile +++ b/package/gluon-config-mode-hostname/Makefile @@ -5,7 +5,7 @@ PKG_VERSION:=1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -include $(GLUONDIR)/include/package.mk +include ../gluon.mk PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) diff --git a/package/gluon-config-mode-mesh-vpn/Makefile b/package/gluon-config-mode-mesh-vpn/Makefile index ec819a9c..c52ffed1 100644 --- a/package/gluon-config-mode-mesh-vpn/Makefile +++ b/package/gluon-config-mode-mesh-vpn/Makefile @@ -5,7 +5,7 @@ PKG_VERSION:=2 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -include $(GLUONDIR)/include/package.mk +include ../gluon.mk PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) diff --git a/package/gluon-core/Makefile b/package/gluon-core/Makefile index 9917a5e0..3e0ae059 100644 --- a/package/gluon-core/Makefile +++ b/package/gluon-core/Makefile @@ -6,7 +6,7 @@ PKG_RELEASE:=$(GLUON_VERSION) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -include $(GLUONDIR)/include/package.mk +include ../gluon.mk define Package/gluon-core diff --git a/package/gluon-legacy/Makefile b/package/gluon-legacy/Makefile index 1cb2e5f4..64607ea3 100644 --- a/package/gluon-legacy/Makefile +++ b/package/gluon-legacy/Makefile @@ -5,7 +5,7 @@ PKG_VERSION:=2 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -include $(GLUONDIR)/include/package.mk +include ../gluon.mk define Package/gluon-legacy diff --git a/package/gluon-luci-admin/Makefile b/package/gluon-luci-admin/Makefile index 7b5f632a..bb6f8350 100644 --- a/package/gluon-luci-admin/Makefile +++ b/package/gluon-luci-admin/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:=1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -include $(GLUONDIR)/include/package.mk +include ../gluon.mk PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) diff --git a/package/gluon-luci-autoupdater/Makefile b/package/gluon-luci-autoupdater/Makefile index 908a0879..4cecb10a 100644 --- a/package/gluon-luci-autoupdater/Makefile +++ b/package/gluon-luci-autoupdater/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:=1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -include $(GLUONDIR)/include/package.mk +include ../gluon.mk PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) diff --git a/package/gluon-luci-mesh-vpn-fastd/Makefile b/package/gluon-luci-mesh-vpn-fastd/Makefile index b6b7ce4f..71dadce7 100644 --- a/package/gluon-luci-mesh-vpn-fastd/Makefile +++ b/package/gluon-luci-mesh-vpn-fastd/Makefile @@ -6,7 +6,7 @@ PKG_RELEASE:=1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -include $(GLUONDIR)/include/package.mk +include ../gluon.mk PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) diff --git a/package/gluon-luci-node-role/Makefile b/package/gluon-luci-node-role/Makefile index 2c862610..058e879c 100644 --- a/package/gluon-luci-node-role/Makefile +++ b/package/gluon-luci-node-role/Makefile @@ -6,7 +6,7 @@ PKG_RELEASE:=1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -include $(GLUONDIR)/include/package.mk +include ../gluon.mk PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) diff --git a/package/gluon-luci-portconfig/Makefile b/package/gluon-luci-portconfig/Makefile index d4590864..eaec9db4 100644 --- a/package/gluon-luci-portconfig/Makefile +++ b/package/gluon-luci-portconfig/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:=1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -include $(GLUONDIR)/include/package.mk +include ../gluon.mk PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) diff --git a/package/gluon-luci-private-wifi/Makefile b/package/gluon-luci-private-wifi/Makefile index 34608900..ef6f2a0a 100644 --- a/package/gluon-luci-private-wifi/Makefile +++ b/package/gluon-luci-private-wifi/Makefile @@ -6,7 +6,7 @@ PKG_RELEASE:=1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -include $(GLUONDIR)/include/package.mk +include ../gluon.mk PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) diff --git a/package/gluon-luci-theme/Makefile b/package/gluon-luci-theme/Makefile index 6e65db3c..2486519a 100644 --- a/package/gluon-luci-theme/Makefile +++ b/package/gluon-luci-theme/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:=1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -include $(GLUONDIR)/include/package.mk +include ../gluon.mk define Package/gluon-luci-theme diff --git a/package/gluon-luci-wifi-config/Makefile b/package/gluon-luci-wifi-config/Makefile index 0f0d90f2..881f2f0e 100644 --- a/package/gluon-luci-wifi-config/Makefile +++ b/package/gluon-luci-wifi-config/Makefile @@ -6,7 +6,7 @@ PKG_RELEASE:=1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -include $(GLUONDIR)/include/package.mk +include ../gluon.mk PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) diff --git a/package/gluon-mesh-batman-adv-14/Makefile b/package/gluon-mesh-batman-adv-14/Makefile index aa53e85f..cd3aa2fb 100644 --- a/package/gluon-mesh-batman-adv-14/Makefile +++ b/package/gluon-mesh-batman-adv-14/Makefile @@ -5,7 +5,7 @@ PKG_VERSION:=1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -include $(GLUONDIR)/include/package.mk +include ../gluon.mk define Package/gluon-mesh-batman-adv-14 diff --git a/package/gluon-mesh-batman-adv-15/Makefile b/package/gluon-mesh-batman-adv-15/Makefile index d64fea88..7f8d8a80 100644 --- a/package/gluon-mesh-batman-adv-15/Makefile +++ b/package/gluon-mesh-batman-adv-15/Makefile @@ -5,7 +5,7 @@ PKG_VERSION:=1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -include $(GLUONDIR)/include/package.mk +include ../gluon.mk define Package/gluon-mesh-batman-adv-15 diff --git a/package/gluon-mesh-batman-adv-core/Makefile b/package/gluon-mesh-batman-adv-core/Makefile index 1989ab78..d476d4f8 100644 --- a/package/gluon-mesh-batman-adv-core/Makefile +++ b/package/gluon-mesh-batman-adv-core/Makefile @@ -6,7 +6,7 @@ PKG_VERSION:=1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DEPENDS := respondd -include $(GLUONDIR)/include/package.mk +include ../gluon.mk define Package/gluon-mesh-batman-adv-core diff --git a/package/gluon-mesh-vpn-fastd/Makefile b/package/gluon-mesh-vpn-fastd/Makefile index 4d75116e..8fceae1a 100644 --- a/package/gluon-mesh-vpn-fastd/Makefile +++ b/package/gluon-mesh-vpn-fastd/Makefile @@ -6,7 +6,7 @@ PKG_VERSION:=3 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DEPENDS := respondd -include $(GLUONDIR)/include/package.mk +include ../gluon.mk define Package/gluon-mesh-vpn-fastd diff --git a/package/gluon-neighbour-info/Makefile b/package/gluon-neighbour-info/Makefile index 498abc4f..867f32f6 100644 --- a/package/gluon-neighbour-info/Makefile +++ b/package/gluon-neighbour-info/Makefile @@ -6,7 +6,7 @@ PKG_RELEASE:=1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -include $(GLUONDIR)/include/package.mk +include ../gluon.mk define Package/gluon-neighbour-info diff --git a/package/gluon-node-info/Makefile b/package/gluon-node-info/Makefile index 8dd31553..59f60dfd 100644 --- a/package/gluon-node-info/Makefile +++ b/package/gluon-node-info/Makefile @@ -7,7 +7,7 @@ PKG_RELEASE:=1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DEPENDS := respondd -include $(GLUONDIR)/include/package.mk +include ../gluon.mk define Package/gluon-node-info diff --git a/package/gluon-radvd/Makefile b/package/gluon-radvd/Makefile index 0ca18177..ba04c04e 100644 --- a/package/gluon-radvd/Makefile +++ b/package/gluon-radvd/Makefile @@ -5,7 +5,7 @@ PKG_VERSION:=3 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -include $(GLUONDIR)/include/package.mk +include ../gluon.mk define Package/gluon-radvd diff --git a/package/gluon-respondd/Makefile b/package/gluon-respondd/Makefile index c6cc71e4..c0b201fa 100644 --- a/package/gluon-respondd/Makefile +++ b/package/gluon-respondd/Makefile @@ -5,7 +5,7 @@ PKG_VERSION:=1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -include $(GLUONDIR)/include/package.mk +include ../gluon.mk define Package/gluon-respondd diff --git a/package/gluon-setup-mode/Makefile b/package/gluon-setup-mode/Makefile index ea9722c0..e34f4858 100644 --- a/package/gluon-setup-mode/Makefile +++ b/package/gluon-setup-mode/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:=1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -include $(GLUONDIR)/include/package.mk +include ../gluon.mk define Package/gluon-setup-mode diff --git a/package/gluon-site/Makefile b/package/gluon-site/Makefile index a0d120e8..b7138e3c 100644 --- a/package/gluon-site/Makefile +++ b/package/gluon-site/Makefile @@ -9,7 +9,7 @@ PKG_BUILD_DEPENDS := luci-base/host lua-cjson/host PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -include $(GLUONDIR)/include/package.mk +include ../gluon.mk PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) @@ -28,7 +28,7 @@ define Build/Configure endef 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) endef diff --git a/package/gluon-status-page-api/Makefile b/package/gluon-status-page-api/Makefile index 703d97f6..1c54dac0 100644 --- a/package/gluon-status-page-api/Makefile +++ b/package/gluon-status-page-api/Makefile @@ -7,7 +7,7 @@ PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DEPENDS := respondd -include $(GLUONDIR)/include/package.mk +include ../gluon.mk define Package/gluon-status-page-api diff --git a/package/gluon-wan-dnsmasq/Makefile b/package/gluon-wan-dnsmasq/Makefile index c672902d..c7c63ca9 100644 --- a/package/gluon-wan-dnsmasq/Makefile +++ b/package/gluon-wan-dnsmasq/Makefile @@ -5,7 +5,7 @@ PKG_VERSION:=1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -include $(GLUONDIR)/include/package.mk +include ../gluon.mk define Package/gluon-wan-dnsmasq diff --git a/include/package.mk b/package/gluon.mk similarity index 100% rename from include/package.mk rename to package/gluon.mk diff --git a/package/libgluonutil/Makefile b/package/libgluonutil/Makefile index bebeb2b3..489a9ba9 100644 --- a/package/libgluonutil/Makefile +++ b/package/libgluonutil/Makefile @@ -8,7 +8,7 @@ PKG_LICENSE:=BSD-2-Clause PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -include $(GLUONDIR)/include/package.mk +include ../gluon.mk include $(INCLUDE_DIR)/cmake.mk