package: avoid use of GLUONDIR variable

2016-10-09 00:18:45 +02:00 · 2016-10-09 00:18:45 +02:00 · 2dd8a700ca
parent 850499fdb3
commit 2dd8a700ca
34 changed files with 34 additions and 34 deletions
--- 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
--- 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
--- 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
--- 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
--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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
--- 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
--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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
--- 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)

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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

--- 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
--- 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
--- a/include/package.mk
+++ b/include/package.mk
--- 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