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 --- net/seafile-server/patches/050-libseafile-makefile-fixes.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'net/seafile-server') diff --git a/net/seafile-server/patches/050-libseafile-makefile-fixes.patch b/net/seafile-server/patches/050-libseafile-makefile-fixes.patch index d83a0974d..38c5ad4d1 100644 --- a/net/seafile-server/patches/050-libseafile-makefile-fixes.patch +++ b/net/seafile-server/patches/050-libseafile-makefile-fixes.patch @@ -12,7 +12,7 @@ diff -rupN seafile-server-5.1.1.orig/lib/Makefile.am seafile-server-5.1.1/lib/Ma seafile-object.h: ${seafile_object_define} rm -f $@ - valac --pkg posix ${seafile_object_define} -C -H seafile-object.h -+ "$(STAGING_DIR)/host/bin/valac" --pkg posix ${seafile_object_define} -C -H seafile-object.h ++ "$(STAGING_DIR_HOSTPKG)/bin/valac" --pkg posix ${seafile_object_define} -C -H seafile-object.h DISTCLEANFILES = ${searpc_gen} @@ -30,7 +30,7 @@ diff -rupN seafile-server-5.1.1.orig/lib/Makefile.am seafile-server-5.1.1/lib/Ma @rm -f vala.tmp @touch vala.tmp - valac -C --pkg posix $^ -+ "$(STAGING_DIR)/host/bin/valac" -C --pkg posix $^ ++ "$(STAGING_DIR_HOSTPKG)/bin/valac" -C --pkg posix $^ @mv -f vala.tmp $@ ${seafile_object_gen}: vala.stamp -- cgit v1.2.3