From 27a2497dc2ef29d7ca348e8103033f09c71d28e1 Mon Sep 17 00:00:00 2001 From: Daniel Elstner Date: Fri, 14 Aug 2015 18:03:47 +0200 Subject: [PATCH] Build: Delay expansion of $datadir in FIRMWARE_DIR Make it so that $(datadir) is resolved at make time, as per autotools recommendations. Note that $datadir is not fully resolved at configure time to begin with, i.e. part of it already was evaluated at make time. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index fe07938f..46ed9de3 100644 --- a/configure.ac +++ b/configure.ac @@ -559,7 +559,7 @@ AM_CONDITIONAL(BINDINGS_JAVA, test x$BINDINGS_JAVA = xyes) # Checks for typedefs, structures, and compiler characteristics. AC_C_BIGENDIAN -AC_SUBST(FIRMWARE_DIR, "$datadir/sigrok-firmware") +AC_SUBST([FIRMWARE_DIR], ['$(datadir)/sigrok-firmware']) AC_SUBST(MAKEFLAGS, '--no-print-directory') AC_SUBST(AM_LIBTOOLFLAGS, '--silent')