diff options
author | Matthias Schiffer <mschiffer@universe-factory.net> | 2017-01-10 15:02:50 +0100 |
---|---|---|
committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2017-01-10 18:25:54 +0100 |
commit | 4a984a8d60f167db87dac6a6c283e62aca692d5e (patch) | |
tree | e0e6f0bcbe5094d62a80018c3d7557e3efe219ac /libs/libupm/Makefile | |
parent | 876d139c98a822f04aed2767b08638cd6efd0a45 (diff) |
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 <mschiffer@universe-factory.net>
Diffstat (limited to 'libs/libupm/Makefile')
-rw-r--r-- | libs/libupm/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/libupm/Makefile b/libs/libupm/Makefile index c1eaad16e..cb7add6d9 100644 --- a/libs/libupm/Makefile +++ b/libs/libupm/Makefile @@ -36,8 +36,8 @@ UPM_MODULES:= \ th02 tm1637 tsl2561 ttp223 ublox6 uln200xa waterlevel wheelencoder wt5001 yg1006 zfm20 CMAKE_OPTIONS=-DBUILDARCH=$(CONFIG_ARCH) \ - -DNODE_EXECUTABLE=$(STAGING_DIR)/host/bin/node \ - -DSWIG_DIR=$(STAGING_DIR)/host/bin + -DNODE_EXECUTABLE=$(STAGING_DIR_HOSTPKG)/bin/node \ + -DSWIG_DIR=$(STAGING_DIR_HOSTPKG)/bin define Package/libupm/Default SECTION:=libs |