diff --git a/package/gluon-core/Makefile b/package/gluon-core/Makefile
index 1b83c424ab2a9e9e5c2d4927c6e1f41218273be3..39218d667d91c324253fa89219d86cf7f523af84 100644
--- a/package/gluon-core/Makefile
+++ b/package/gluon-core/Makefile
@@ -7,8 +7,6 @@ PKG_VERSION:=$(if $(DUMP),x,$(GLUON_VERSION))
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
-GLUON_PKG_MAKE:=1
-
 include ../gluon.mk
 include $(INCLUDE_DIR)/cmake.mk
 
diff --git a/package/gluon-ebtables-limit-arp/Makefile b/package/gluon-ebtables-limit-arp/Makefile
index 399cca2b76f486b10c92d17a1aa4c81e14a87e9c..4562c62788c6e4b513c957ebf165b30bf28e9929 100644
--- a/package/gluon-ebtables-limit-arp/Makefile
+++ b/package/gluon-ebtables-limit-arp/Makefile
@@ -4,8 +4,6 @@ PKG_NAME:=gluon-ebtables-limit-arp
 PKG_VERSION:=1
 PKG_RELEASE:=1
 
-GLUON_PKG_MAKE:=1
-
 include ../gluon.mk
 
 define Package/gluon-ebtables-limit-arp
diff --git a/package/gluon-neighbour-info/Makefile b/package/gluon-neighbour-info/Makefile
index 11d9465f150f645d5cf904305afcc4ac18818be8..37bd4a4951e69686993f14eec2622babf44aa970 100644
--- a/package/gluon-neighbour-info/Makefile
+++ b/package/gluon-neighbour-info/Makefile
@@ -4,8 +4,6 @@ PKG_NAME:=gluon-neighbour-info
 PKG_VERSION:=1
 PKG_RELEASE:=1
 
-GLUON_PKG_MAKE:=1
-
 include ../gluon.mk
 
 define Package/gluon-neighbour-info
diff --git a/package/gluon-status-page/Makefile b/package/gluon-status-page/Makefile
index acf4cef8587d779fe08b9bd886eac7e55f1fe378..7401f0990ac6c3f67e0eb6eeb1e6b383cfd5dcaa 100644
--- a/package/gluon-status-page/Makefile
+++ b/package/gluon-status-page/Makefile
@@ -3,8 +3,6 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=gluon-status-page
 PKG_VERSION:=3
 
-GLUON_PKG_MAKE:=1
-
 include ../gluon.mk
 
 define Package/gluon-status-page
diff --git a/package/gluon-web/Makefile b/package/gluon-web/Makefile
index 8606ad6d065dd86c48e888f71d9a6b0b890c4379..796ed361756a2cdd997f4e76f264b7e595383046 100644
--- a/package/gluon-web/Makefile
+++ b/package/gluon-web/Makefile
@@ -3,7 +3,6 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=gluon-web
 PKG_VERSION:=1
 
-GLUON_PKG_MAKE:=1
 PKG_INSTALL:=1
 
 include ../gluon.mk
diff --git a/package/gluon.mk b/package/gluon.mk
index 1e2cb5a595bb69caaaf10f14d92347e696c310cb..ea9658ad9fa3291d9e5e5c763e5443703732510d 100644
--- a/package/gluon.mk
+++ b/package/gluon.mk
@@ -6,7 +6,6 @@ PKG_BUILD_DEPENDS += luci-base/host
 
 ifneq ($(wildcard ./src/respondd.c),)
   PKG_BUILD_DEPENDS += respondd
-  GLUON_PKG_MAKE ?= 1
 endif
 
 include $(INCLUDE_DIR)/package.mk
@@ -67,10 +66,8 @@ define GluonSrcDiet
 endef
 
 
-GLUON_PKG_MAKE ?= 0
-
 define Gluon/Build/Compile
-	$(if $(findstring $(GLUON_PKG_MAKE),1),
+	$(if $(wildcard ./src/Makefile ./src/CMakeLists.txt),
 		$(Build/Compile/Default)
 	)
 	$(if $(wildcard ./luasrc/.),