diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2020-06-23 12:48:05 +0200 |
|---|---|---|
| committer | Romain Bouvier <skunnyk@alteroot.org> | 2020-06-24 12:20:58 +0200 |
| commit | 45bac52f22b1892adbe5fee471b84d423c10efd0 (patch) | |
| tree | 504eacd5d08a1038e0a78c9146e3cef2a11b7dd4 | |
| parent | 5c426e931f1e5eb10f3a63f3b54c9ea6b293543c (diff) | |
| download | xfce4-dev-tools-45bac52f22b1892adbe5fee471b84d423c10efd0.tar.gz | |
xdt-autogen: explicitly set search path for m4 macros
There is no guarantee that the configured include dir is in aclocal
default search path. For example, system aclocal may not search for m4
macros under /usr/local.
Fixes #36
| -rw-r--r-- | scripts/xdt-autogen.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/xdt-autogen.in b/scripts/xdt-autogen.in index 48adfa0..2f65c5a 100644 --- a/scripts/xdt-autogen.in +++ b/scripts/xdt-autogen.in @@ -30,7 +30,8 @@ XDT_AUTOGEN_VERSION_MICRO="@VERSION_MICRO@" XDT_AUTOGEN_VERSION_REVISION="@VERSION_REVISION@" prefix="@prefix@" -datarootdir="@prefix@" +datarootdir="@datarootdir@" +m4macrodir="${datarootdir}/aclocal" ## ## a few portability tests @@ -477,7 +478,7 @@ for configure_ac_file in ${CONFIGURE_AC_FILES}; do echo "Preparing package directory ${source_dir}..." # set aclocal flags - ACLOCAL_FLAGS="${ACLOCAL_FLAGS} ${XDT_ACLOCAL_FLAGS}" + ACLOCAL_FLAGS="${ACLOCAL_FLAGS} ${XDT_ACLOCAL_FLAGS} -I ${m4macrodir}" if test -d "${source_dir}/m4macros"; then ACLOCAL_FLAGS="${ACLOCAL_FLAGS} -I ${source_dir}/m4macros"; fi |