From 9ba9bfb9a02706fa414bcf4c6dcceac1b68a5c9a Mon Sep 17 00:00:00 2001 From: Samuel Martin Date: Sun, 22 Jul 2012 15:28:34 +0200 Subject: pkg-*targets.mk: factorize and fix $(PKG)_SRCDIR and $(PKG)_BUILDDIR declaration Signed-off-by: Samuel Martin Signed-off-by: Thomas Petazzoni --- package/pkg-generic.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'package/pkg-generic.mk') diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index c01440e64..8a730c0a0 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -204,6 +204,17 @@ $(2)_BASE_NAME = $(1)-$$($(2)_VERSION) $(2)_DL_DIR = $$(DL_DIR)/$$($(2)_BASE_NAME) $(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASE_NAME) +ifndef $(3)_SUBDIR + ifdef $(2)_SUBDIR + $(3)_SUBDIR = $$($(2)_SUBDIR) + else + $(3)_SUBDIR ?= + endif +endif + +$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR) +$(2)_BUILDDIR ?= $$($(2)_SRCDIR) + ifneq ($$($(2)_OVERRIDE_SRCDIR),) $(2)_VERSION = custom endif -- cgit v1.2.3