From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 24 Jul 2012 07:17:56 +0000 (+0200)
Subject: pkg-generic: fix SUBDIR handling
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8e26abecd00f4899fb122c3eeb03fbdf20cda32e;p=buildroot.git

pkg-generic: fix SUBDIR handling

Commit 9ba9bfb9a02706fa414bcf4c6dcceac1b68a5c9a inverted the logic to
define $(2)_SUBDIR, breaking the build of things using the _SUBDIR
feature, like the tcl package.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 8a730c0a01..d1f4f2a2ce 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -204,11 +204,11 @@ $(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)
+ifndef $(2)_SUBDIR
+ ifdef $(3)_SUBDIR
+  $(2)_SUBDIR = $$($(3)_SUBDIR)
  else
-  $(3)_SUBDIR ?=
+  $(2)_SUBDIR ?=
  endif
 endif