From: Leonardo Mörlein <me@irrelefant.net>
Date: Mon, 9 Aug 2021 22:48:40 +0000 (+0200)
Subject: automake: always use correct path for aclocal.real
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ffd9bd7b9b5f54b71bc4bba33f9a53dddc47d585;p=openwrt%2Fstaging%2Fxback.git

automake: always use correct path for aclocal.real

Before this commit, it was assumed that aclocal.real is in the PATH. While
this was fine for the normal build workflow, this led to some issues if

    make TOPDIR="$(pwd)" -C "$pkgdir" compile

was called manually. The command failed with:

    /home/.../openwrt/staging_dir/host/bin/aclocal: line 2: aclocal.real: command not found
    autoreconf: /home/.../openwrt/staging_dir/host/bin/aclocal failed with exit status: 127

After the commit, the package is built sucessfully.

Signed-off-by: Leonardo Mörlein <me@irrelefant.net>
---

diff --git a/tools/automake/files/aclocal b/tools/automake/files/aclocal
index a60df10c42..689cb041f5 100755
--- a/tools/automake/files/aclocal
+++ b/tools/automake/files/aclocal
@@ -1,2 +1,2 @@
 #!/usr/bin/env sh
-aclocal.real $ACLOCAL_INCLUDE $@
+${STAGING_DIR_HOST}/bin/aclocal.real $ACLOCAL_INCLUDE $@