From 9e7e9b215017ee91c9369f01476bb4b4fc5f2484 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Thu, 7 Nov 2013 17:26:52 +0100 Subject: [PATCH] infra: remove incorrect default for FOO_DIR_PREFIX Variable FOO_DIR_PREFIX is populated from pkgparentdir by the various package infrastructures. However, if that would be empty (which in fact is the case for the linux package), FOO_DIR_PREFIX would be set to '$(TOP_SRCDIR)/package'. Not only does this make no sense (LINUX_DIR_PREFIX becomes /package/linux, and for all other packages pkgparentdir is not-empty anyway), but it is also using a non-existing variable TOP_SRCDIR. This patch therefore removes the incorrect default. Signed-off-by: Thomas De Schampheleire Signed-off-by: Peter Korsgaard --- package/pkg-generic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 80b38a5808..3b6bc76512 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -314,7 +314,7 @@ $(2)_DEPENDENCIES ?= $(filter-out $(1),$(patsubst host-host-%,host-%,$(addprefix $(2)_INSTALL_STAGING ?= NO $(2)_INSTALL_IMAGES ?= NO $(2)_INSTALL_TARGET ?= YES -$(2)_DIR_PREFIX = $(if $(4),$(4),$(TOP_SRCDIR)/package) +$(2)_DIR_PREFIX = $(4) # define sub-target stamps $(2)_TARGET_INSTALL_TARGET = $$($(2)_DIR)/.stamp_target_installed -- 2.30.2