From 651cbaf5114dce425ea135f16b64e0bd7d012cca Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Mon, 1 Feb 2016 22:59:23 +0000
Subject: [PATCH] defs.mk, make.mk, rpmdist.mk: Fix various package build
 errors

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 make/defs.mk    | 10 +++++++++-
 make/make.mk    | 10 +++++++---
 make/rpmdist.mk |  7 -------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/make/defs.mk b/make/defs.mk
index aba4e6fc..c7a1a9f8 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -40,6 +40,8 @@ endif
 
 OS                    ?= $(shell sh $(MOD_SCRIPT_DIR)/get_os.sh)
 
+CREATE_DEVEL          ?= true
+
 ifeq ($(TARGET),mingw)
 FLAVOUR_PREFIX        ?= win32-
 FLAVOUR_SUFFIX        ?= -win32
@@ -79,6 +81,12 @@ PROJECT_CAPNAME        = $(shell echo $(PROJECT) | tr [a-z] [A-Z] | $(SED) 's/-/
 PROJECT_DESCR         ?= No description
 CUSTOMER              ?= jannet
 
+ifneq ($(PROJECT_DESCR_FILE),)
+ifeq ($(shell grep "^ *subpackages *=.*devel" $(PROJECT_DESCR_FILE)),)
+CREATE_DEVEL           = false
+endif
+endif
+
 VERSION_FILE          ?= $(firstword $(wildcard VERSION $(TOPDIR)/VERSION))
 VERSION               := $(shell $(CAT) $(VERSION_FILE))
 DIST_VERSION          ?= $(shell $(SED) -e "s/-dev//" $(VERSION_FILE))
@@ -926,7 +934,7 @@ LIBFLAGS                  += $(call proj_query, ldflags $(PREREQ_BUILD) $(PROJEC
 
 #include $(MODDIR)/make/lib-deps.mk
 
-BTOOLS_DIR             ?= $(call proj_dir, btools)
+BTOOLS_DIR             ?= $(call proj_dir, dspider-btools)
 #DSPCD_DIR              ?= $(call proj_dir, dspcd)
 #DSPCD_EC_DIR           ?= $(call proj_dir, dspcd-ec)
 FEEDFSD_DIR            ?= $(call proj_dir, feedfsd)
diff --git a/make/make.mk b/make/make.mk
index b68d07ea..f6f1d31b 100644
--- a/make/make.mk
+++ b/make/make.mk
@@ -3,9 +3,13 @@
 # contact@jannet.de
 # $Id$
 
-MKFILES += $(wildcard project.conf)
-
 include $(MODDIR)/make/defs.mk
+
+ifneq ($(CREATE_DEVEL),false)
+MKFILES += $(wildcard project.conf)
+DEVEL_TARGETS += install_MAKE $(INSTALLED_PKG_MK) install_PKG_CONFIG
+endif
+
 include $(MODDIR)/make/rules.mk
 
 #LOCAL_PKG_CONFIG = $(PROJECT).pc
@@ -23,7 +27,7 @@ endif
 
 #all: $(BUILD_PKG_CONFIG)
 all: build_PKG_CONFIG
-install: install_MAKE $(INSTALLED_PKG_MK) install_PKG_CONFIG
+install: $(DEVEL_TARGETS)
 clean: textclean localclean doneclean clean.pkg-config
 test:
 
diff --git a/make/rpmdist.mk b/make/rpmdist.mk
index 7321dae0..697294c1 100644
--- a/make/rpmdist.mk
+++ b/make/rpmdist.mk
@@ -1,10 +1,3 @@
-ifneq ($(PROJECT_DESCR_FILE),)
-ifeq ($(shell grep "^ *subpackages *=.*devel" $(PROJECT_DESCR_FILE)),)
-CREATE_DEVEL              = false
-endif
-endif
-
-CREATE_DEVEL             ?= true
 UPLOAD_SH                 = $(MOD_SCRIPT_DIR)/upload.sh
 RPM_PROJECT              ?= $(FLAVOUR_PREFIX)$(PROJECT)
 LOCAL_MKSPEC_SH          ?= $(TOPDIR)/make/mkspec.sh