From 4a984a8d60f167db87dac6a6c283e62aca692d5e Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 10 Jan 2017 15:02:50 +0100 Subject: treewide: replace $(STAGING_DIR)/host and $(HOST_BUILD_PREFIX) with $(STAGING_DIR_HOSTPKG) As both LEDE and OpenWrt have STAGING_DIR_HOSTPKG now, we can start to rely on it. See 73b7f55424de52d8179a9ad808252fe3bf8dcc9d for more information on STAGING_DIR_HOSTPKG. STAGING_DIR_HOSTPKG won't actually be changed before the first LEDE release (it is equivalent to $(STAGING_DIR)/host), so this simple search/replace cleanup is safe to apply. Doing this cleanup now will be useful for the Gluon project (an OpenWrt/LEDE based firmware framework) for experimenting with modifying STAGING_DIR_HOSTPKG before doing this in the LEDE upstream. Also fixes a typo in the dbus Makefile ("STAGIND_DIR"). Signed-off-by: Matthias Schiffer --- lang/perl-xml-parser/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lang/perl-xml-parser') diff --git a/lang/perl-xml-parser/Makefile b/lang/perl-xml-parser/Makefile index e5d3b2c88..57977c19b 100644 --- a/lang/perl-xml-parser/Makefile +++ b/lang/perl-xml-parser/Makefile @@ -25,8 +25,8 @@ HOST_BUILD_DEPENDS:=perl/host expat/host EXPAT_LIBPATH:=$(STAGING_DIR)/usr/lib EXPAT_INCPATH=$(STAGING_DIR)/usr/include -HOST_EXPAT_LIBPATH:=$(STAGING_DIR)/host/lib -HOST_EXPAT_INCPATH=$(STAGING_DIR)/host/include +HOST_EXPAT_LIBPATH:=$(STAGING_DIR_HOSTPKG)/lib +HOST_EXPAT_INCPATH=$(STAGING_DIR_HOSTPKG)/include include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk -- cgit v1.2.3