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 /utils/dbus | |
| 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 'utils/dbus')
| -rw-r--r-- | utils/dbus/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/utils/dbus/Makefile b/utils/dbus/Makefile index 16ed227e2..0560fc6a0 100644 --- a/utils/dbus/Makefile +++ b/utils/dbus/Makefile @@ -122,11 +122,11 @@ HOST_CONFIGURE_ARGS+= \ --disable-verbose-mode \ --disable-xml-docs \ --with-dbus-user=root \ - --with-dbus-daemondir="$(STAGIND_DIR)/host/bin" \ - --with-system-socket="$(STAGING_DIR)/host/var/run/dbus/system_bus_socket" \ - --with-system-pid-file="$(STAGING_DIR)/host/var/run/dbus.pid" \ + --with-dbus-daemondir="$(STAGING_DIR_HOSTPKG)/bin" \ + --with-system-socket="$(STAGING_DIR_HOSTPKG)/var/run/dbus/system_bus_socket" \ + --with-system-pid-file="$(STAGING_DIR_HOSTPKG)/var/run/dbus.pid" \ --without-x \ - --libexecdir="$(STAGING_DIR)/host/lib/dbus-1" + --libexecdir="$(STAGING_DIR_HOSTPKG)/lib/dbus-1" HOST_CONFIGURE_VARS+= \ ac_cv_have_abstract_sockets="yes" \ |